diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs index 7ae220d099..9b9a487243 100644 --- a/Content.Client/Construction/ConstructionMenu.cs +++ b/Content.Client/Construction/ConstructionMenu.cs @@ -185,16 +185,16 @@ namespace Content.Client.Construction switch (tool.ToolQuality) { case ToolQuality.Anchoring: - icon = _resourceCache.GetResource("/Textures/Objects/Tools/wrench.png"); + icon = _resourceCache.GetResource("/Textures/Objects/Tools/wrench.rsi/icon.png"); text = "Wrench"; break; case ToolQuality.Prying: - icon = _resourceCache.GetResource("/Textures/Objects/Tools/crowbar.png"); + icon = _resourceCache.GetResource("/Textures/Objects/Tools/crowbar.rsi/icon.png"); text = "Crowbar"; break; case ToolQuality.Screwing: icon = _resourceCache.GetResource( - "/Textures/Objects/Tools/screwdriver.png"); + "/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png"); text = "Screwdriver"; break; case ToolQuality.Welding: @@ -204,7 +204,7 @@ namespace Content.Client.Construction break; case ToolQuality.Cutting: icon = _resourceCache.GetResource( - "/Textures/Objects/Tools/wirecutter.png"); + "/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png"); text = "Wirecutters"; break; default: diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index 92085c56bf..aeb779b0c0 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -53,8 +53,8 @@ namespace Content.Client.GameObjects void AddButton(out ItemSlotButton variable, Slots slot, string textureName) { - var texture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png"); - var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png"); + var texture = _resourceCache.GetTexture($"/Textures/Interface/Inventory/{textureName}.png"); + var storageTexture = _resourceCache.GetTexture("/Textures/Interface/Inventory/back.png"); variable = new ItemSlotButton(texture, storageTexture) { OnPressed = (e) => AddToInventory(e, slot), @@ -193,8 +193,8 @@ namespace Content.Client.GameObjects void AddButton(Slots slot, string textureName, Vector2 position) { - var texture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png"); - var storageTexture = resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png"); + var texture = resourceCache.GetTexture($"/Textures/Interface/Inventory/{textureName}.png"); + var storageTexture = resourceCache.GetTexture("/Textures/Interface/Inventory/back.png"); var button = new ItemSlotButton(texture, storageTexture); LayoutContainer.SetPosition(button, position); diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs index ed7333b65d..63ecab02cc 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs @@ -37,7 +37,7 @@ namespace Content.Client.GameObjects.Components.Kitchen var audioParams = AudioParams.Default; audioParams.Loop = true; var schedSound = new ScheduledSound(); - schedSound.Filename = "/Audio/machines/microwave_loop.ogg"; + schedSound.Filename = "/Audio/Machines/microwave_loop.ogg"; schedSound.AudioParams = audioParams; _loopingSoundComponent.StopAllSounds(); _loopingSoundComponent.AddScheduledSound(schedSound); diff --git a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs b/Content.Client/GameObjects/Components/PDA/PDAComponent.cs index bdeb4f7ffb..fc134497d6 100644 --- a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Client/GameObjects/Components/PDA/PDAComponent.cs @@ -17,11 +17,11 @@ namespace Content.Client.GameObjects.Components.PDA switch(message) { case PDAUplinkBuySuccessMessage _ : - EntitySystem.Get().Play("/Audio/effects/kaching.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().Play("/Audio/Effects/kaching.ogg", Owner, AudioParams.Default.WithVolume(-2f)); break; case PDAUplinkInsufficientFundsMessage _ : - EntitySystem.Get().Play("/Audio/effects/error.ogg", Owner, AudioParams.Default); + EntitySystem.Get().Play("/Audio/Effects/error.ogg", Owner, AudioParams.Default); break; } diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs index adf93dc3ab..f879c7c8f0 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs @@ -180,7 +180,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels }, (_chamberedBullet = new TextureRect { - Texture = StaticIoC.ResC.GetTexture("/Textures/UserInterface/status/bullets/chambered.png"), + Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered.png"), SizeFlagsVertical = SizeFlags.ShrinkCenter, SizeFlagsHorizontal = SizeFlags.ShrinkEnd | SizeFlags.Fill, }) @@ -211,15 +211,15 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels string texturePath; if (capacity <= 20) { - texturePath = "/Textures/UserInterface/status/bullets/normal.png"; + texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; } else if (capacity <= 30) { - texturePath = "/Textures/UserInterface/status/bullets/small.png"; + texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; } else { - texturePath = "/Textures/UserInterface/status/bullets/tiny.png"; + texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; } var texture = StaticIoC.ResC.GetTexture(texturePath); diff --git a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs index f4d78223cd..53e1a32064 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs @@ -43,7 +43,7 @@ namespace Content.Client.GameObjects.Components.Wires MouseFilter = MouseFilterMode.Stop; - var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png"); + var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, @@ -306,7 +306,7 @@ namespace Content.Client.GameObjects.Components.Wires private sealed class WireControl : Control { - private const string TextureContact = "/Textures/UserInterface/WireHacking/contact.svg.96dpi.png"; + private const string TextureContact = "/Textures/Interface/WireHacking/contact.svg.96dpi.png"; public event Action WireClicked; public event Action ContactsClicked; @@ -405,20 +405,20 @@ namespace Content.Client.GameObjects.Components.Wires private static readonly string[] TextureNormal = { - "/Textures/UserInterface/WireHacking/wire_1.svg.96dpi.png", - "/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png" + "/Textures/Interface/WireHacking/wire_1.svg.96dpi.png", + "/Textures/Interface/WireHacking/wire_2.svg.96dpi.png" }; private static readonly string[] TextureCut = { - "/Textures/UserInterface/WireHacking/wire_1_cut.svg.96dpi.png", - "/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png", + "/Textures/Interface/WireHacking/wire_1_cut.svg.96dpi.png", + "/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png", }; private static readonly string[] TextureCopper = { - "/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png", - "/Textures/UserInterface/WireHacking/wire_2_copper.svg.96dpi.png" + "/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png", + "/Textures/Interface/WireHacking/wire_2_copper.svg.96dpi.png" }; public WireRender(WireColor color, bool isCut, bool flip, bool mirror, int type) @@ -532,7 +532,7 @@ namespace Content.Client.GameObjects.Components.Wires new TextureRect { Texture = resC.GetTexture( - "/Textures/UserInterface/WireHacking/light_off_base.svg.96dpi.png"), + "/Textures/Interface/WireHacking/light_off_base.svg.96dpi.png"), Stretch = TextureRect.StretchMode.KeepCentered, ModulateSelfOverride = dimColor }, @@ -541,7 +541,7 @@ namespace Content.Client.GameObjects.Components.Wires ModulateSelfOverride = data.Color.WithAlpha(0.4f), Stretch = TextureRect.StretchMode.KeepCentered, Texture = - resC.GetTexture("/Textures/UserInterface/WireHacking/light_on_base.svg.96dpi.png"), + resC.GetTexture("/Textures/Interface/WireHacking/light_on_base.svg.96dpi.png"), }) } }; diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index 33710ce83b..2d55a2b5a1 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -576,7 +576,7 @@ namespace Content.Client.GameObjects.EntitySystems new TextureRect { Texture = IoCManager.Resolve() - .GetTexture("/Textures/UserInterface/VerbIcons/group.svg.96dpi.png"), + .GetTexture("/Textures/Interface/VerbIcons/group.svg.96dpi.png"), Stretch = TextureRect.StretchMode.KeepCentered, } } diff --git a/Content.Client/State/LauncherConnecting.cs b/Content.Client/State/LauncherConnecting.cs index 0f530e5a54..adfcc5a505 100644 --- a/Content.Client/State/LauncherConnecting.cs +++ b/Content.Client/State/LauncherConnecting.cs @@ -34,7 +34,7 @@ namespace Content.Client.State public override void Startup() { - var panelTex = ResC.GetTexture("/Nano/button.svg.96dpi.png"); + var panelTex = ResC.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs index 69afe49fb2..4b6f9f4049 100644 --- a/Content.Client/UserInterface/CharacterSetupGui.cs +++ b/Content.Client/UserInterface/CharacterSetupGui.cs @@ -45,7 +45,7 @@ namespace Content.Client.UserInterface AddChild(margin); - var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png"); + var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/UserInterface/GameHud.cs index 587dbe4304..318e1c051f 100644 --- a/Content.Client/UserInterface/GameHud.cs +++ b/Content.Client/UserInterface/GameHud.cs @@ -111,12 +111,12 @@ namespace Content.Client.UserInterface RootControl = new LayoutContainer(); LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide); - var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png"); - var characterTexture = _resourceCache.GetTexture("/Textures/UserInterface/character.svg.96dpi.png"); - var inventoryTexture = _resourceCache.GetTexture("/Textures/UserInterface/inventory.svg.96dpi.png"); - var craftingTexture = _resourceCache.GetTexture("/Textures/UserInterface/hammer.svg.96dpi.png"); - var tutorialTexture = _resourceCache.GetTexture("/Textures/UserInterface/students-cap.svg.96dpi.png"); - var sandboxTexture = _resourceCache.GetTexture("/Textures/UserInterface/sandbox.svg.96dpi.png"); + var escapeTexture = _resourceCache.GetTexture("/Textures/Interface/hamburger.svg.96dpi.png"); + var characterTexture = _resourceCache.GetTexture("/Textures/Interface/character.svg.96dpi.png"); + var inventoryTexture = _resourceCache.GetTexture("/Textures/Interface/inventory.svg.96dpi.png"); + var craftingTexture = _resourceCache.GetTexture("/Textures/Interface/hammer.svg.96dpi.png"); + var tutorialTexture = _resourceCache.GetTexture("/Textures/Interface/students-cap.svg.96dpi.png"); + var sandboxTexture = _resourceCache.GetTexture("/Textures/Interface/sandbox.svg.96dpi.png"); _topButtonsContainer = new HBoxContainer { diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index 88915e620e..b77bf04560 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -40,10 +40,10 @@ namespace Content.Client.UserInterface { IoCManager.InjectDependencies(this); - var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png"); - var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png"); - var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png"); - var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png"); + var textureHandLeft = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_l.png"); + var textureHandRight = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_r.png"); + var textureHandActive = _resourceCache.GetTexture("/Textures/Interface/Inventory/hand_active.png"); + var storageTexture = _resourceCache.GetTexture("/Textures/Interface/Inventory/back.png"); _rightStatusPanel = new ItemStatusPanel(true); _leftStatusPanel = new ItemStatusPanel(false); diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.cs b/Content.Client/UserInterface/HumanoidProfileEditor.cs index 7a6f5f33d4..8bcc069762 100644 --- a/Content.Client/UserInterface/HumanoidProfileEditor.cs +++ b/Content.Client/UserInterface/HumanoidProfileEditor.cs @@ -567,7 +567,7 @@ namespace Content.Client.UserInterface if (job.Icon != null) { - var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/job_icons.rsi"), job.Icon); + var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/Interface/Misc/job_icons.rsi"), job.Icon); icon.Texture = specifier.Frame0(); } diff --git a/Content.Client/UserInterface/ItemStatusPanel.cs b/Content.Client/UserInterface/ItemStatusPanel.cs index fe94573a17..4bd99c446f 100644 --- a/Content.Client/UserInterface/ItemStatusPanel.cs +++ b/Content.Client/UserInterface/ItemStatusPanel.cs @@ -35,8 +35,8 @@ namespace Content.Client.UserInterface var panel = new StyleBoxTexture { Texture = ResC.GetTexture(isRightHand - ? "/Nano/item_status_right.svg.96dpi.png" - : "/Nano/item_status_left.svg.96dpi.png") + ? "/Textures/Interface/Nano/item_status_right.svg.96dpi.png" + : "/Textures/Interface/Nano/item_status_left.svg.96dpi.png") }; panel.SetContentMarginOverride(StyleBox.Margin.Vertical, 4); panel.SetContentMarginOverride(StyleBox.Margin.Horizontal, 6); diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs index 413587a8ed..2b077446f1 100644 --- a/Content.Client/UserInterface/LobbyGui.cs +++ b/Content.Client/UserInterface/LobbyGui.cs @@ -39,7 +39,7 @@ namespace Content.Client.UserInterface AddChild(margin); - var panelTex = resourceCache.GetTexture("/Nano/button.svg.96dpi.png"); + var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, diff --git a/Content.Client/UserInterface/Stylesheets/StyleBase.cs b/Content.Client/UserInterface/Stylesheets/StyleBase.cs index 10562fad2f..04b2b390fd 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleBase.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleBase.cs @@ -19,10 +19,10 @@ namespace Content.Client.UserInterface.Stylesheets protected StyleBase(IResourceCache resCache) { - var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12); + var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12); // Button styles. - var buttonTex = resCache.GetTexture("/Nano/button.svg.96dpi.png"); + var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); BaseButton = new StyleBoxTexture { Texture = buttonTex, diff --git a/Content.Client/UserInterface/Stylesheets/StyleNano.cs b/Content.Client/UserInterface/Stylesheets/StyleNano.cs index d2d9941eb8..1f8f06a47d 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleNano.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleNano.cs @@ -41,17 +41,17 @@ namespace Content.Client.UserInterface.Stylesheets public StyleNano(IResourceCache resCache) : base(resCache) { - var notoSans10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 10); - var notoSansItalic10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Italic.ttf", 10); - var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12); - var notoSansItalic12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Italic.ttf", 12); - var notoSansBold12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 12); + var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); + var notoSansItalic10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 10); + var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12); + var notoSansItalic12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 12); + var notoSansBold12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 12); var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14); - var notoSans16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 16); - var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16); - var notoSansBold20 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 20); - var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png"); - var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png"); + var notoSans16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 16); + var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); + var notoSansBold20 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 20); + var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png"); + var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png"); var windowHeader = new StyleBoxTexture { Texture = windowHeaderTex, @@ -59,7 +59,7 @@ namespace Content.Client.UserInterface.Stylesheets ExpandMarginBottom = 3, ContentMarginBottomOverride = 0 }; - var windowBackgroundTex = resCache.GetTexture("/Nano/window_background.png"); + var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/window_background.png"); var windowBackground = new StyleBoxTexture { Texture = windowBackgroundTex, @@ -67,7 +67,7 @@ namespace Content.Client.UserInterface.Stylesheets windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); - var textureInvertedTriangle = resCache.GetTexture("/Nano/inverted_triangle.svg.png"); + var textureInvertedTriangle = resCache.GetTexture("/Textures/Interface/Nano/inverted_triangle.svg.png"); // Button styles. var buttonNormal = new StyleBoxTexture(BaseButton) @@ -90,7 +90,7 @@ namespace Content.Client.UserInterface.Stylesheets Modulate = ButtonColorDisabled }; - var lineEditTex = resCache.GetTexture("/Nano/lineedit.png"); + var lineEditTex = resCache.GetTexture("/Textures/Interface/Nano/lineedit.png"); var lineEdit = new StyleBoxTexture { Texture = lineEditTex, @@ -98,7 +98,7 @@ namespace Content.Client.UserInterface.Stylesheets lineEdit.SetPatchMargin(StyleBox.Margin.All, 3); lineEdit.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5); - var tabContainerPanelTex = resCache.GetTexture("/Nano/tabcontainer_panel.png"); + var tabContainerPanelTex = resCache.GetTexture("/Textures/Interface/Nano/tabcontainer_panel.png"); var tabContainerPanel = new StyleBoxTexture { Texture = tabContainerPanelTex, @@ -152,11 +152,11 @@ namespace Content.Client.UserInterface.Stylesheets progressBarForeground.SetContentMarginOverride(StyleBox.Margin.Vertical, 5); // CheckBox - var checkBoxTextureChecked = resCache.GetTexture("/Nano/checkbox_checked.svg.96dpi.png"); - var checkBoxTextureUnchecked = resCache.GetTexture("/Nano/checkbox_unchecked.svg.96dpi.png"); + var checkBoxTextureChecked = resCache.GetTexture("/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png"); + var checkBoxTextureUnchecked = resCache.GetTexture("/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png"); // Tooltip box - var tooltipTexture = resCache.GetTexture("/Nano/tooltip.png"); + var tooltipTexture = resCache.GetTexture("/Textures/Interface/Nano/tooltip.png"); var tooltipBox = new StyleBoxTexture { Texture = tooltipTexture, @@ -165,7 +165,7 @@ namespace Content.Client.UserInterface.Stylesheets tooltipBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5); // Placeholder - var placeholderTexture = resCache.GetTexture("/Nano/placeholder.png"); + var placeholderTexture = resCache.GetTexture("/Textures/Interface/Nano/placeholder.png"); var placeholder = new StyleBoxTexture {Texture = placeholderTexture}; placeholder.SetPatchMargin(StyleBox.Margin.All, 19); placeholder.SetExpandMargin(StyleBox.Margin.All, -5); @@ -185,7 +185,7 @@ namespace Content.Client.UserInterface.Stylesheets itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4); // NanoHeading - var nanoHeadingTex = resCache.GetTexture("/Nano/nanoheading.svg.96dpi.png"); + var nanoHeadingTex = resCache.GetTexture("/Textures/Interface/Nano/nanoheading.svg.96dpi.png"); var nanoHeadingBox = new StyleBoxTexture { Texture = nanoHeadingTex, @@ -199,7 +199,7 @@ namespace Content.Client.UserInterface.Stylesheets nanoHeadingBox.SetPatchMargin(StyleBox.Margin.Left | StyleBox.Margin.Bottom, 2); // Stripe background - var stripeBackTex = resCache.GetTexture("/Nano/stripeback.svg.96dpi.png"); + var stripeBackTex = resCache.GetTexture("/Textures/Interface/Nano/stripeback.svg.96dpi.png"); var stripeBack = new StyleBoxTexture { Texture = stripeBackTex, @@ -207,9 +207,9 @@ namespace Content.Client.UserInterface.Stylesheets }; // Slider - var sliderOutlineTex = resCache.GetTexture("/Nano/slider_outline.svg.96dpi.png"); - var sliderFillTex = resCache.GetTexture("/Nano/slider_fill.svg.96dpi.png"); - var sliderGrabTex = resCache.GetTexture("/Nano/slider_grabber.svg.96dpi.png"); + var sliderOutlineTex = resCache.GetTexture("/Textures/Interface/Nano/slider_outline.svg.96dpi.png"); + var sliderFillTex = resCache.GetTexture("/Textures/Interface/Nano/slider_fill.svg.96dpi.png"); + var sliderGrabTex = resCache.GetTexture("/Textures/Interface/Nano/slider_grabber.svg.96dpi.png"); var sliderFillBox = new StyleBoxTexture { diff --git a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs index b5ff88f41c..9785482fef 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs @@ -22,8 +22,8 @@ namespace Content.Client.UserInterface.Stylesheets public StyleSpace(IResourceCache resCache) : base(resCache) { - var notoSans10 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 10); - var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16); + var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); + var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); // Button styles. var buttonNormal = new StyleBoxTexture(BaseButton) diff --git a/Content.Client/UserInterface/TargetingDoll.cs b/Content.Client/UserInterface/TargetingDoll.cs index e631be946c..9d70c818d8 100644 --- a/Content.Client/UserInterface/TargetingDoll.cs +++ b/Content.Client/UserInterface/TargetingDoll.cs @@ -11,9 +11,9 @@ namespace Content.Client.UserInterface private TargetingZone _activeZone = TargetingZone.Middle; public const string StyleClassTargetDollZone = "target-doll-zone"; - private const string TextureHigh = "/Textures/UserInterface/target-doll-high.svg.96dpi.png"; - private const string TextureMiddle = "/Textures/UserInterface/target-doll-middle.svg.96dpi.png"; - private const string TextureLow = "/Textures/UserInterface/target-doll-low.svg.96dpi.png"; + private const string TextureHigh = "/Textures/Interface/target-doll-high.svg.96dpi.png"; + private const string TextureMiddle = "/Textures/Interface/target-doll-middle.svg.96dpi.png"; + private const string TextureLow = "/Textures/Interface/target-doll-low.svg.96dpi.png"; private readonly TextureButton _buttonHigh; private readonly TextureButton _buttonMiddle; diff --git a/Content.Client/UserInterface/TutorialWindow.cs b/Content.Client/UserInterface/TutorialWindow.cs index ce9362a62c..d34ac4cb0d 100644 --- a/Content.Client/UserInterface/TutorialWindow.cs +++ b/Content.Client/UserInterface/TutorialWindow.cs @@ -46,7 +46,7 @@ namespace Content.Client.UserInterface //Get section header font var cache = IoCManager.Resolve(); var inputManager = IoCManager.Resolve(); - Font headerFont = new VectorFont(cache.GetResource("/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize); + Font headerFont = new VectorFont(cache.GetResource("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize); var scrollContainer = new ScrollContainer(); scrollContainer.AddChild(VBox = new VBoxContainer()); diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index 44b8926b71..54d6bb4ba0 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -128,7 +128,7 @@ namespace Content.Server.Explosions Shaded = false }; entitySystemManager.GetEntitySystem().CreateParticle(message); - entitySystemManager.GetEntitySystem().PlayAtCoords("/Audio/effects/explosion.ogg", coords); + entitySystemManager.GetEntitySystem().PlayAtCoords("/Audio/Effects/explosion.ogg", coords); // Knock back cameras of all players in the area. diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index 6a7a855713..367181e6b0 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -324,7 +324,7 @@ namespace Content.Server.GameObjects.Components.Chemistry private void ClickSound() { - EntitySystem.Get().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); } diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index c72c05f10c..4a4dcbabef 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components.Chemistry private SolutionCaps _capabilities; private string _fillInitState; private int _fillInitSteps; - private string _fillPathString = "Objects/Chemistry/fillings.rsi"; + private string _fillPathString = "Objects/Specific/Chemistry/fillings.rsi"; private ResourcePath _fillPath; private SpriteSpecifier _fillSprite; @@ -494,7 +494,7 @@ namespace Content.Server.GameObjects.Components.Chemistry } //Play reaction sound client-side - _audioSystem.PlayAtCoords("/Audio/effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition); + _audioSystem.PlayAtCoords("/Audio/Effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition); } /// diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index 339e235790..65f0892c85 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -382,7 +382,7 @@ namespace Content.Server.GameObjects.Components.Doors BoltsDown = newBolts; EntitySystem.Get() - .PlayFromEntity(newBolts ? "/Audio/machines/boltsdown.ogg" : "/Audio/machines/boltsup.ogg", Owner); + .PlayFromEntity(newBolts ? "/Audio/Machines/boltsdown.ogg" : "/Audio/Machines/boltsup.ogg", Owner); } } } diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs index 024ea93f4c..ff8a0feaef 100644 --- a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs @@ -30,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Explosion serializer.DataField(ref _range, "range", 7.0f); serializer.DataField(ref _duration, "duration", 8.0); - serializer.DataField(ref _sound, "sound", "/Audio/effects/flash_bang.ogg"); + serializer.DataField(ref _sound, "sound", "/Audio/Effects/flash_bang.ogg"); serializer.DataField(ref _deleteOnFlash, "deleteOnFlash", true); } diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index b35dd8d7b7..12715b6e95 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Fluids /// public override void ExposeData(ObjectSerializer serializer) { - serializer.DataFieldCached(ref _sound, "sound", "/Audio/effects/Fluids/watersplash.ogg"); + serializer.DataFieldCached(ref _sound, "sound", "/Audio/Effects/Fluids/watersplash.ogg"); } /// diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs index 22fc46878a..665b2d5e26 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Fluids /// public override void ExposeData(ObjectSerializer serializer) { - serializer.DataFieldCached(ref _pickupSound, "pickup_sound", "/Audio/effects/Fluids/slosh.ogg"); + serializer.DataFieldCached(ref _pickupSound, "pickup_sound", "/Audio/Effects/Fluids/slosh.ogg"); // The turbo mop will pickup more serializer.DataFieldCached(ref _pickupAmount, "pickup_amount", ReagentUnit.New(5)); } diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs index 7e5356fc3b..4eae6d7379 100644 --- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs @@ -85,7 +85,7 @@ namespace Content.Server.GameObjects.Components.Fluids /// public override void ExposeData(ObjectSerializer serializer) { - serializer.DataFieldCached(ref _spillSound, "spill_sound", "/Audio/effects/Fluids/splat.ogg"); + serializer.DataFieldCached(ref _spillSound, "spill_sound", "/Audio/Effects/Fluids/splat.ogg"); serializer.DataField(ref _overflowVolume, "overflow_volume", ReagentUnit.New(20)); serializer.DataField(ref _evaporateTime, "evaporate_time", 600.0f); // Long-term probably have this based on the underlying reagents diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 42086c3cb0..a151639a78 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Interactable return false; } - EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/pistol_magin.ogg", Owner); Dirty(); @@ -139,7 +139,7 @@ namespace Content.Server.GameObjects.Components.Interactable SetState(false); Activated = false; - EntitySystem.Get().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner); } @@ -154,7 +154,7 @@ namespace Content.Server.GameObjects.Components.Interactable if (cell == null) { - EntitySystem.Get().PlayFromEntity("/Audio/machines/button.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/button.ogg", Owner); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing...")); return; @@ -165,7 +165,7 @@ namespace Content.Server.GameObjects.Components.Interactable // Simple enough. if (Wattage > cell.CurrentCharge) { - EntitySystem.Get().PlayFromEntity("/Audio/machines/button.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/button.ogg", Owner); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell...")); return; } @@ -173,7 +173,7 @@ namespace Content.Server.GameObjects.Components.Interactable Activated = true; SetState(true); - EntitySystem.Get().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner); } @@ -221,7 +221,7 @@ namespace Content.Server.GameObjects.Components.Interactable cell.Owner.Transform.GridPosition = user.Transform.GridPosition; } - EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magout.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/pistol_magout.ogg", Owner); } diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index 3ebd014501..a8a4a8bafa 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -53,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Items { var desiredTile = _tileDefinitionManager[_outputTile]; mapGrid.SetTile(eventArgs.ClickLocation, new Tile(desiredTile.TileId)); - EntitySystem.Get().PlayAtCoords("/Audio/items/genhit.ogg", eventArgs.ClickLocation); + EntitySystem.Get().PlayAtCoords("/Audio/Items/genhit.ogg", eventArgs.ClickLocation); if(_stack.Count < 1){ Owner.Delete(); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 2792be485a..403ea6de74 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -170,7 +170,7 @@ namespace Content.Server.GameObjects.Components } ModifyComponents(); - EntitySystem.Get().PlayFromEntity("/Audio/machines/closetclose.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/closetclose.ogg", Owner); _lastInternalOpenAttempt = default; } @@ -179,7 +179,7 @@ namespace Content.Server.GameObjects.Components Open = true; EmptyContents(); ModifyComponents(); - EntitySystem.Get().PlayFromEntity("/Audio/machines/closetopen.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/closetopen.ogg", Owner); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index dbdb37c09e..e9b83f78b7 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -109,7 +109,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage if (CheckAccess(user)) return; Locked = false; - EntitySystem.Get().PlayFromEntity("/Audio/machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/door_lock_off.ogg", Owner, AudioParams.Default.WithVolume(-5)); } private void DoLock(IEntity user) @@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage if (CheckAccess(user)) return; Locked = true; - EntitySystem.Get().PlayFromEntity("/Audio/machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/door_lock_on.ogg", Owner, AudioParams.Default.WithVolume(-5)); } private bool CheckAccess(IEntity user) diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index e7af82550d..71ffa3aa01 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -83,8 +83,8 @@ namespace Content.Server.GameObjects.Components.Kitchen serializer.DataField(ref _badRecipeName, "failureResult", "FoodBadRecipe"); serializer.DataField(ref _cookTimeDefault, "cookTime", 5); serializer.DataField(ref _cookTimeMultiplier, "cookTimeMultiplier", 1000); - serializer.DataField(ref _startCookingSound, "beginCookingSound","/Audio/machines/microwave_start_beep.ogg" ); - serializer.DataField(ref _cookingCompleteSound, "foodDoneSound","/Audio/machines/microwave_done_beep.ogg" ); + serializer.DataField(ref _startCookingSound, "beginCookingSound","/Audio/Machines/microwave_start_beep.ogg" ); + serializer.DataField(ref _cookingCompleteSound, "foodDoneSound","/Audio/Machines/microwave_done_beep.ogg" ); } public override void Initialize() @@ -441,7 +441,7 @@ namespace Content.Server.GameObjects.Components.Kitchen private void ClickSound() { - _audioSystem.PlayFromEntity("/Audio/machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f)); + _audioSystem.PlayFromEntity("/Audio/Machines/machine_switch.ogg",Owner,AudioParams.Default.WithVolume(-2f)); } public SuicideKind Suicide(IEntity victim, IChatManager chat) diff --git a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs index 863766c377..acf9a52fac 100644 --- a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs @@ -14,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Mining public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref MiningSound, "miningSound", "/Audio/items/mining/pickaxe.ogg"); + serializer.DataField(ref MiningSound, "miningSound", "/Audio/Items/mining/pickaxe.ogg"); serializer.DataField(ref MiningSpeedMultiplier, "miningSpeedMultiplier", 1f); } } diff --git a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs index a943e8a438..485624b5de 100644 --- a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs @@ -55,8 +55,8 @@ namespace Content.Server.GameObjects.Components.Mobs { status.ChangeStatusEffectIcon(StatusEffect.Buckled, Buckled - ? "/Textures/Mob/UI/Buckle/buckled.png" - : "/Textures/Mob/UI/Buckle/unbuckled.png"); + ? "/Textures/Interface/StatusEffects/Buckle/buckled.png" + : "/Textures/Interface/StatusEffects/Buckle/unbuckled.png"); } } diff --git a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs index d800514df1..3b34bc892b 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs @@ -39,17 +39,17 @@ namespace Content.Server.GameObjects [UsedImplicitly] public static readonly string[] _humanStatusImages = { - "/Textures/Mob/UI/Human/human0.png", - "/Textures/Mob/UI/Human/human1.png", - "/Textures/Mob/UI/Human/human2.png", - "/Textures/Mob/UI/Human/human3.png", - "/Textures/Mob/UI/Human/human4.png", - "/Textures/Mob/UI/Human/human5.png", - "/Textures/Mob/UI/Human/human6-0.png", - "/Textures/Mob/UI/Human/human6-1.png", - "/Textures/Mob/UI/Human/humancrit-0.png", - "/Textures/Mob/UI/Human/humancrit-1.png", - "/Textures/Mob/UI/Human/humandead.png", + "/Textures/Interface/StatusEffects/Human/human0.png", + "/Textures/Interface/StatusEffects/Human/human1.png", + "/Textures/Interface/StatusEffects/Human/human2.png", + "/Textures/Interface/StatusEffects/Human/human3.png", + "/Textures/Interface/StatusEffects/Human/human4.png", + "/Textures/Interface/StatusEffects/Human/human5.png", + "/Textures/Interface/StatusEffects/Human/human6-0.png", + "/Textures/Interface/StatusEffects/Human/human6-1.png", + "/Textures/Interface/StatusEffects/Human/humancrit-0.png", + "/Textures/Interface/StatusEffects/Human/humancrit-1.png", + "/Textures/Interface/StatusEffects/Human/humandead.png", }; public override void ChangeHudState(DamageableComponent damage) @@ -67,7 +67,7 @@ namespace Content.Server.GameObjects } var modifier = totaldamage / (critvalue / normalstates); //integer division floors towards zero statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Health, - "/Textures/Mob/UI/Human/human" + modifier + ".png"); + "/Textures/Interface/StatusEffects/Human/human" + modifier + ".png"); overlayComponent?.RemoveOverlay(OverlayType.GradientCircleMaskOverlay); overlayComponent?.RemoveOverlay(OverlayType.CircleMaskOverlay); @@ -76,7 +76,7 @@ namespace Content.Server.GameObjects case ThresholdType.Critical: statusEffectsComponent?.ChangeStatusEffectIcon( StatusEffect.Health, - "/Textures/Mob/UI/Human/humancrit-0.png"); + "/Textures/Interface/StatusEffects/Human/humancrit-0.png"); overlayComponent?.ClearOverlays(); overlayComponent?.AddOverlay(OverlayType.GradientCircleMaskOverlay); @@ -84,7 +84,7 @@ namespace Content.Server.GameObjects case ThresholdType.Death: statusEffectsComponent?.ChangeStatusEffectIcon( StatusEffect.Health, - "/Textures/Mob/UI/Human/humandead.png"); + "/Textures/Interface/StatusEffects/Human/humandead.png"); overlayComponent?.ClearOverlays(); overlayComponent?.AddOverlay(OverlayType.CircleMaskOverlay); diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 0b72696503..95e4398f6e 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs serializer.DataField(ref _helpInterval, "helpInterval", 1f); serializer.DataField(ref _helpKnockdownRemove, "helpKnockdownRemove", 1f); serializer.DataField(ref _stunTexture, "stunTexture", - "/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png"); + "/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png"); } /// @@ -171,7 +171,7 @@ namespace Content.Server.GameObjects.Components.Mobs Timer.Spawn(((int) _helpInterval * 1000), () => _canHelp = true); EntitySystem.Get() - .PlayFromEntity("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f)); + .PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f)); _knockdownTimer -= _helpKnockdownRemove; diff --git a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs index bc14e3e0ac..9dea2ae96d 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs @@ -49,8 +49,8 @@ namespace Content.Server.GameObjects.Components.Movement serializer.DataField(ref _individualPortalCooldown, "individual_cooldown", 2.1f); // How long before anyone can go in it serializer.DataField(ref _overallPortalCooldown, "overall_cooldown", 2.0f); - serializer.DataField(ref _departureSound, "departure_sound", "/Audio/effects/teleport_departure.ogg"); - serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/effects/teleport_arrival.ogg"); + serializer.DataField(ref _departureSound, "departure_sound", "/Audio/Effects/teleport_departure.ogg"); + serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/Effects/teleport_arrival.ogg"); } public override void Initialize() diff --git a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs index 12e55c9576..f9be2f20de 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs @@ -58,8 +58,8 @@ namespace Content.Server.GameObjects.Components.Movement serializer.DataField(ref _chargeTime, "charge_time", 0.2f); serializer.DataField(ref _cooldown, "cooldown", 2.0f); serializer.DataField(ref _avoidCollidable, "avoid_walls", true); - serializer.DataField(ref _departureSound, "departure_sound", "/Audio/effects/teleport_departure.ogg"); - serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/effects/teleport_arrival.ogg"); + serializer.DataField(ref _departureSound, "departure_sound", "/Audio/Effects/teleport_departure.ogg"); + serializer.DataField(ref _arrivalSound, "arrival_sound", "/Audio/Effects/teleport_arrival.ogg"); serializer.DataField(ref _cooldownSound, "cooldown_sound", null); serializer.DataField(ref _portalAliveTime, "portal_alive_time", 5.0f); // TODO: Change this to 0 before PR? } diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 38d6e1fffe..2a1097a13b 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -55,7 +55,7 @@ namespace Content.Server.GameObjects.Components.Nutrition public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref _useSound, "useSound", "/Audio/items/drink.ogg"); + serializer.DataField(ref _useSound, "useSound", "/Audio/Items/drink.ogg"); serializer.DataField(ref _defaultToOpened, "isOpen", false); //For things like cups of coffee. serializer.DataField(ref _soundCollection, "openSounds","canOpenSounds"); } diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index e38af09497..1dae799af5 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -47,7 +47,7 @@ namespace Content.Server.GameObjects.Components.Nutrition public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg"); + serializer.DataField(ref _useSound, "useSound", "/Audio/Items/eatfood.ogg"); serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5)); serializer.DataField(ref _trashPrototype, "trash", null); diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs index edf37b0400..4fb6b6d2f3 100644 --- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs @@ -72,11 +72,11 @@ namespace Content.Server.GameObjects.Components.Nutrition [UsedImplicitly] public static readonly string[] _hungerThresholdImages = { - "/Textures/Mob/UI/Hunger/Overfed.png", - "/Textures/Mob/UI/Hunger/Okay.png", - "/Textures/Mob/UI/Hunger/Peckish.png", - "/Textures/Mob/UI/Hunger/Starving.png", - "/Textures/Mob/UI/Hunger/Dead.png", + "/Textures/Interface/StatusEffects/Hunger/Overfed.png", + "/Textures/Interface/StatusEffects/Hunger/Okay.png", + "/Textures/Interface/StatusEffects/Hunger/Peckish.png", + "/Textures/Interface/StatusEffects/Hunger/Starving.png", + "/Textures/Interface/StatusEffects/Hunger/Dead.png", }; public void HungerThresholdEffect(bool force = false) diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs index 62ad13e2a2..12b7d7ae9f 100644 --- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs @@ -66,11 +66,11 @@ namespace Content.Server.GameObjects.Components.Nutrition [UsedImplicitly] public static readonly string[] _thirstThresholdImages = { - "/Textures/Mob/UI/Thirst/OverHydrated.png", - "/Textures/Mob/UI/Thirst/Okay.png", - "/Textures/Mob/UI/Thirst/Thirsty.png", - "/Textures/Mob/UI/Thirst/Parched.png", - "/Textures/Mob/UI/Thirst/Dead.png", + "/Textures/Interface/StatusEffects/Thirst/OverHydrated.png", + "/Textures/Interface/StatusEffects/Thirst/Okay.png", + "/Textures/Interface/StatusEffects/Thirst/Thirsty.png", + "/Textures/Interface/StatusEffects/Thirst/Parched.png", + "/Textures/Interface/StatusEffects/Thirst/Dead.png", }; public override void ExposeData(ObjectSerializer serializer) @@ -92,7 +92,7 @@ namespace Content.Server.GameObjects.Components.Nutrition // Update UI Owner.TryGetComponent(out ServerStatusEffectsComponent statusEffectsComponent); - statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Mob/UI/Thirst/" + + statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Thirst, "/Textures/Interface/StatusEffects/Thirst/" + _currentThirstThreshold + ".png"); switch (_currentThirstThreshold) diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index eb7f1d1b68..e4a02108e5 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs @@ -199,7 +199,7 @@ namespace Content.Server.GameObjects.Components.PDA { _idSlot.Insert(card.Owner); ContainedID = card; - EntitySystem.Get().PlayFromEntity("/Audio/Guns/MagIn/batrifle_magin.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg", Owner); } /// @@ -223,7 +223,7 @@ namespace Content.Server.GameObjects.Components.PDA { _lightOn = !_lightOn; _pdaLight.Enabled = _lightOn; - EntitySystem.Get().PlayFromEntity("/Audio/items/flashlight_toggle.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/flashlight_toggle.ogg", Owner); UpdatePDAUserInterface(); } @@ -242,7 +242,7 @@ namespace Content.Server.GameObjects.Components.PDA hands.PutInHandOrDrop(cardItemComponent); ContainedID = null; - EntitySystem.Get().PlayFromEntity("/Audio/machines/id_swipe.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/id_swipe.ogg", Owner); UpdatePDAUserInterface(); } diff --git a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs index 5de2091e62..ff1dec7e23 100644 --- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs +++ b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.GameObjects.Components private void Rustle() { EntitySystem.Get() - .PlayFromEntity("/Audio/effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f)); + .PlayFromEntity("/Audio/Effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f)); } } } diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs index 5b5c62b12a..12e77904eb 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs @@ -80,7 +80,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { MainBreakerEnabled = !MainBreakerEnabled; _uiDirty = true; - EntitySystem.Get().PlayFromEntity("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); } } diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index a391b27a6f..01a468fc10 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -99,7 +99,7 @@ namespace Content.Server.GameObjects.Components.Power { damageableComponent.TakeDamage(DamageType.Heat, 20, Owner); var audioSystem = EntitySystem.Get(); - audioSystem.PlayFromEntity("/Audio/effects/lightburn.ogg", Owner); + audioSystem.PlayFromEntity("/Audio/Effects/lightburn.ogg", Owner); } void Eject() @@ -192,7 +192,7 @@ namespace Content.Server.GameObjects.Components.Power if (time > _lastThunk + _thunkDelay) { _lastThunk = time; - EntitySystem.Get().PlayFromEntity("/Audio/machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f)); + EntitySystem.Get().PlayFromEntity("/Audio/Machines/light_tube_on.ogg", Owner, AudioParams.Default.WithVolume(-10f)); } } else diff --git a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs index 994d301c1f..b845614bdd 100644 --- a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs @@ -52,10 +52,10 @@ namespace Content.Server.GameObjects.Components.Projectiles serializer.DataField(ref _collisionMask, "layers", (int) CollisionGroup.Opaque, WithFormat.Flags()); serializer.DataField(ref _damage, "damage", 10.0f); serializer.DataField(ref _damageType, "damageType", DamageType.Heat); - serializer.DataField(ref _spriteName, "spriteName", "Objects/Guns/Projectiles/laser.png"); + serializer.DataField(ref _spriteName, "spriteName", "Objects/Weapons/Guns/Projectiles/laser.png"); serializer.DataField(ref _muzzleFlash, "muzzleFlash", null); serializer.DataField(ref _impactFlash, "impactFlash", null); - serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Guns/Hits/laser_sear_wall.ogg"); + serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg"); } public void FireEffects(IEntity user, float distance, Angle angle, IEntity hitEntity = null) diff --git a/Content.Server/GameObjects/Components/RotatableComponent.cs b/Content.Server/GameObjects/Components/RotatableComponent.cs index 2cdacd5f10..a8f83cfdeb 100644 --- a/Content.Server/GameObjects/Components/RotatableComponent.cs +++ b/Content.Server/GameObjects/Components/RotatableComponent.cs @@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components data.CategoryData = VerbCategories.Rotate; data.Text = "Rotate clockwise"; - data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_cw.svg.96dpi.png"; + data.IconTexture = "/Textures/Interface/VerbIcons/rotate_cw.svg.96dpi.png"; } protected override void Activate(IEntity user, RotatableComponent component) @@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.Components data.CategoryData = VerbCategories.Rotate; data.Text = "Rotate counter-clockwise"; - data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_ccw.svg.96dpi.png"; + data.IconTexture = "/Textures/Interface/VerbIcons/rotate_ccw.svg.96dpi.png"; } protected override void Activate(IEntity user, RotatableComponent component) diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index 539c605a8b..8c7671702b 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -121,8 +121,8 @@ namespace Content.Server.GameObjects.Components.Strap base.ExposeData(serializer); serializer.DataField(ref _position, "position", StrapPosition.None); - serializer.DataField(ref _buckleSound, "buckleSound", "/Audio/effects/buckle.ogg"); - serializer.DataField(ref _unbuckleSound, "unbuckleSound", "/Audio/effects/unbuckle.ogg"); + serializer.DataField(ref _buckleSound, "buckleSound", "/Audio/Effects/buckle.ogg"); + serializer.DataField(ref _unbuckleSound, "unbuckleSound", "/Audio/Effects/unbuckle.ogg"); serializer.DataField(ref _rotation, "rotation", 0); var defaultSize = 100; diff --git a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs index 797a2160d9..a45cd363ad 100644 --- a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs +++ b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs @@ -94,7 +94,7 @@ namespace Content.Server.GameObjects.Components.Utensil } serializer.DataField(ref _breakChance, "breakChance", 0); - serializer.DataField(ref _breakSound, "breakSound", "/Audio/items/snap.ogg"); + serializer.DataField(ref _breakSound, "breakSound", "/Audio/Items/snap.ogg"); } void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index 6473490d56..457aa83139 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.GameObjects.Components.VendingMachines if (!string.IsNullOrEmpty(_spriteName)) { var spriteComponent = Owner.GetComponent(); - const string vendingMachineRSIPath = "Buildings/VendingMachines/{0}.rsi"; + const string vendingMachineRSIPath = "Constructible/Power/VendingMachines/{0}.rsi"; spriteComponent.BaseRSIPath = string.Format(vendingMachineRSIPath, _spriteName); } diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs index e5c20ae24a..0a9bee0f6f 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs @@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee }); } - EntitySystem.Get().PlayAtCoords("/Audio/weapons/flash.ogg", Owner.Transform.GridPosition, + EntitySystem.Get().PlayAtCoords("/Audio/Weapons/flash.ogg", Owner.Transform.GridPosition, AudioParams.Default); return true; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 121d755527..41b06f06df 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -77,7 +77,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee serializer.DataField(ref _range, "range", 1); serializer.DataField(ref _arcWidth, "arcwidth", 90); serializer.DataField(ref _arc, "arc", "default"); - serializer.DataField(ref _hitSound, "hitSound", "/Audio/weapons/genhit1.ogg"); + serializer.DataField(ref _hitSound, "hitSound", "/Audio/Weapons/genhit1.ogg"); serializer.DataField(ref _cooldownTime, "cooldownTime", 1f); } @@ -116,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee var audioSystem = EntitySystem.Get(); var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0]; - audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter); + audioSystem.PlayFromEntity(hitEntities.Count > 0 ? _hitSound : "/Audio/Weapons/punchmiss.ogg", emitter); if (Arc != null) { diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 367c67fdac..6914d71baf 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee { return false; } - EntitySystem.Get().PlayAtCoords("/Audio/weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/Weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); foreach (var entity in entities) { @@ -165,7 +165,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (cell == null) { - EntitySystem.Get().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Cell missing...")); return; @@ -173,7 +173,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (cell.CurrentCharge < EnergyPerUse) { - EntitySystem.Get().PlayAtCoords("/Audio/machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/Machines/button.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); _notifyManager.PopupMessage(Owner, user, _localizationManager.GetString("Dead cell...")); return; } @@ -205,7 +205,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee return false; } - EntitySystem.Get().PlayFromEntity("/Audio/items/weapons/pistol_magin.ogg", Owner); + EntitySystem.Get().PlayFromEntity("/Audio/Items/pistol_magin.ogg", Owner); Dirty(); @@ -236,7 +236,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee cell.Owner.Transform.GridPosition = user.Transform.GridPosition; } - EntitySystem.Get().PlayAtCoords("/Audio/items/weapons/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); + EntitySystem.Get().PlayAtCoords("/Audio/Items/pistol_magout.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); } public void Examine(FormattedMessage message, bool inDetailsRange) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index d65f8c54ae..236cd4f5aa 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -89,7 +89,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition serializer.DataField(ref _caseless, "caseless", false); // Being both caseless and shooting yourself doesn't make sense DebugTools.Assert(!(_ammoIsProjectile && _caseless)); - serializer.DataField(ref _muzzleFlashSprite, "muzzleFlash", "Objects/Guns/Projectiles/bullet_muzzle.png"); + serializer.DataField(ref _muzzleFlashSprite, "muzzleFlash", "Objects/Weapons/Guns/Projectiles/bullet_muzzle.png"); serializer.DataField(ref _soundCollectionEject, "soundCollectionEject", "CasingEject"); if (_projectilesFired < 1) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index 6ee38d4337..d5bf68bb0f 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -103,10 +103,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _fillPrototype, "fillPrototype", null); serializer.DataField(ref _autoCycle, "autoCycle", false); - serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg"); - serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", "/Audio/Guns/Bolt/rifle_bolt_open.ogg"); - serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", "/Audio/Guns/Bolt/rifle_bolt_closed.ogg"); - serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg"); + serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); + serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", "/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg"); + serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", "/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); } void IMapInit.MapInit() diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs index 5116f2db5f..dc5cdde017 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -66,8 +66,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _fillPrototype, "fillPrototype", null); serializer.DataField(ref _manualCycle, "manualCycle", true); - serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg"); - serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg"); + serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); _spawnedAmmo = new Stack(_capacity - 1); } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs index 3d07ecfe18..685531c518 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -58,9 +58,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _fillPrototype, "fillPrototype", null); // Sounds - serializer.DataField(ref _soundEject, "soundEject", "/Audio/Guns/MagOut/revolver_magout.ogg"); - serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/revolver_magin.ogg"); - serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Guns/Misc/revolver_spin.ogg"); + serializer.DataField(ref _soundEject, "soundEject", "/Audio/Weapons/Guns/MagOut/revolver_magout.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Weapons/Guns/MagIn/revolver_magin.ogg"); + serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Weapons/Guns/Misc/revolver_spin.ogg"); } public override void Initialize() diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index 21731fdfb9..eaf2453ca5 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -113,7 +113,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _soundRack, "soundRack", null); serializer.DataField(ref _soundMagInsert, "soundMagInsert", null); serializer.DataField(ref _soundMagEject, "soundMagEject", null); - serializer.DataField(ref _soundAutoEject, "soundAutoEject", "/Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg"); + serializer.DataField(ref _soundAutoEject, "soundAutoEject", "/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); } public override ComponentState GetComponentState() diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index dcf5af0083..58b3acce0d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataField(ref _canMuzzleFlash, "canMuzzleFlash", true); // Sounds serializer.DataField(ref _soundGunshot, "soundGunshot", null); - serializer.DataField(ref _soundEmpty, "soundEmpty", "/Audio/Guns/Empty/empty.ogg"); + serializer.DataField(ref _soundEmpty, "soundEmpty", "/Audio/Weapons/Guns/Empty/empty.ogg"); } public override void OnAdd() diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index c1d91359a5..2c8534edd6 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -430,7 +430,7 @@ namespace Content.Server.GameObjects.Components return; } - _audioSystem.PlayFromEntity("/Audio/effects/multitool_pulse.ogg", Owner); + _audioSystem.PlayFromEntity("/Audio/Effects/multitool_pulse.ogg", Owner); break; } @@ -476,7 +476,7 @@ namespace Content.Server.GameObjects.Components IsPanelOpen = !IsPanelOpen; EntitySystem.Get() - .PlayFromEntity(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg", + .PlayFromEntity(IsPanelOpen ? "/Audio/Machines/screwdriveropen.ogg" : "/Audio/Machines/screwdriverclose.ogg", Owner); return true; } diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index b3c390909a..92963b3e77 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -274,7 +274,7 @@ namespace Content.Server.GameObjects.EntitySystems } // OK WE'RE GOOD CONSTRUCTION STARTED. - Get().PlayAtCoords("/Audio/items/deconstruct.ogg", loc); + Get().PlayAtCoords("/Audio/Items/deconstruct.ogg", loc); if (prototype.Stages.Count == 2) { // Exactly 2 stages, so don't make an intermediate frame. @@ -326,7 +326,7 @@ namespace Content.Server.GameObjects.EntitySystems } // OK WE'RE GOOD CONSTRUCTION STARTED. - EntitySystem.Get().PlayFromEntity("/Audio/items/deconstruct.ogg", placingEnt); + EntitySystem.Get().PlayFromEntity("/Audio/Items/deconstruct.ogg", placingEnt); if (prototype.Stages.Count == 2) { // Exactly 2 stages, so don't make an intermediate frame. diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs index 27eb28a6c5..f87d303d05 100644 --- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs @@ -93,7 +93,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Interaction { if (player.AttachedEntity == null || player.AttachedEntity.Transform.GridID != gridId) continue; - EntitySystem.Get().PlayFromEntity("/Audio/effects/alert.ogg", player.AttachedEntity); + EntitySystem.Get().PlayFromEntity("/Audio/Effects/alert.ogg", player.AttachedEntity); } } diff --git a/Content.Shared/GameObjects/Verbs/VerbCategories.cs b/Content.Shared/GameObjects/Verbs/VerbCategories.cs index 9a0f6b2aea..bd5c168eaa 100644 --- a/Content.Shared/GameObjects/Verbs/VerbCategories.cs +++ b/Content.Shared/GameObjects/Verbs/VerbCategories.cs @@ -6,7 +6,7 @@ namespace Content.Shared.GameObjects public static class VerbCategories { public static readonly VerbCategoryData Debug = - ("Debug", "/Textures/UserInterface/VerbIcons/debug.svg.96dpi.png"); + ("Debug", "/Textures/Interface/VerbIcons/debug.svg.96dpi.png"); public static readonly VerbCategoryData Rotate = ("Rotate", null); } diff --git a/Resources/.gitignore b/Resources/.gitignore index ca05cddaaa..672ebaae9c 100644 --- a/Resources/.gitignore +++ b/Resources/.gitignore @@ -3,5 +3,5 @@ # you can do a negation with !. *.import # Negation would be like this: -#!/Textures/UserInterface/handsbox.png.import +#!/Textures/Interface/handsbox.png.import /I_MADE_THE_SYMLINK diff --git a/Resources/Audio/effects/chemistry/bubbles.ogg b/Resources/Audio/Effects/Chemistry/bubbles.ogg similarity index 100% rename from Resources/Audio/effects/chemistry/bubbles.ogg rename to Resources/Audio/Effects/Chemistry/bubbles.ogg diff --git a/Resources/Audio/effects/Egloves.ogg b/Resources/Audio/Effects/Egloves.ogg similarity index 100% rename from Resources/Audio/effects/Egloves.ogg rename to Resources/Audio/Effects/Egloves.ogg diff --git a/Resources/Audio/effects/Fluids/slosh.ogg b/Resources/Audio/Effects/Fluids/slosh.ogg similarity index 100% rename from Resources/Audio/effects/Fluids/slosh.ogg rename to Resources/Audio/Effects/Fluids/slosh.ogg diff --git a/Resources/Audio/effects/Fluids/splat.ogg b/Resources/Audio/Effects/Fluids/splat.ogg similarity index 100% rename from Resources/Audio/effects/Fluids/splat.ogg rename to Resources/Audio/Effects/Fluids/splat.ogg diff --git a/Resources/Audio/effects/Fluids/watersplash.ogg b/Resources/Audio/Effects/Fluids/watersplash.ogg similarity index 100% rename from Resources/Audio/effects/Fluids/watersplash.ogg rename to Resources/Audio/Effects/Fluids/watersplash.ogg diff --git a/Resources/Audio/effects/footsteps/asteroid1.ogg b/Resources/Audio/Effects/Footsteps/asteroid1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/asteroid1.ogg rename to Resources/Audio/Effects/Footsteps/asteroid1.ogg diff --git a/Resources/Audio/effects/footsteps/asteroid2.ogg b/Resources/Audio/Effects/Footsteps/asteroid2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/asteroid2.ogg rename to Resources/Audio/Effects/Footsteps/asteroid2.ogg diff --git a/Resources/Audio/effects/footsteps/asteroid3.ogg b/Resources/Audio/Effects/Footsteps/asteroid3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/asteroid3.ogg rename to Resources/Audio/Effects/Footsteps/asteroid3.ogg diff --git a/Resources/Audio/effects/footsteps/asteroid4.ogg b/Resources/Audio/Effects/Footsteps/asteroid4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/asteroid4.ogg rename to Resources/Audio/Effects/Footsteps/asteroid4.ogg diff --git a/Resources/Audio/effects/footsteps/asteroid5.ogg b/Resources/Audio/Effects/Footsteps/asteroid5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/asteroid5.ogg rename to Resources/Audio/Effects/Footsteps/asteroid5.ogg diff --git a/Resources/Audio/effects/footsteps/carpet1.ogg b/Resources/Audio/Effects/Footsteps/carpet1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/carpet1.ogg rename to Resources/Audio/Effects/Footsteps/carpet1.ogg diff --git a/Resources/Audio/effects/footsteps/carpet2.ogg b/Resources/Audio/Effects/Footsteps/carpet2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/carpet2.ogg rename to Resources/Audio/Effects/Footsteps/carpet2.ogg diff --git a/Resources/Audio/effects/footsteps/carpet3.ogg b/Resources/Audio/Effects/Footsteps/carpet3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/carpet3.ogg rename to Resources/Audio/Effects/Footsteps/carpet3.ogg diff --git a/Resources/Audio/effects/footsteps/carpet4.ogg b/Resources/Audio/Effects/Footsteps/carpet4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/carpet4.ogg rename to Resources/Audio/Effects/Footsteps/carpet4.ogg diff --git a/Resources/Audio/effects/footsteps/carpet5.ogg b/Resources/Audio/Effects/Footsteps/carpet5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/carpet5.ogg rename to Resources/Audio/Effects/Footsteps/carpet5.ogg diff --git a/Resources/Audio/effects/footsteps/catwalk1.ogg b/Resources/Audio/Effects/Footsteps/catwalk1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/catwalk1.ogg rename to Resources/Audio/Effects/Footsteps/catwalk1.ogg diff --git a/Resources/Audio/effects/footsteps/catwalk2.ogg b/Resources/Audio/Effects/Footsteps/catwalk2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/catwalk2.ogg rename to Resources/Audio/Effects/Footsteps/catwalk2.ogg diff --git a/Resources/Audio/effects/footsteps/catwalk3.ogg b/Resources/Audio/Effects/Footsteps/catwalk3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/catwalk3.ogg rename to Resources/Audio/Effects/Footsteps/catwalk3.ogg diff --git a/Resources/Audio/effects/footsteps/catwalk4.ogg b/Resources/Audio/Effects/Footsteps/catwalk4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/catwalk4.ogg rename to Resources/Audio/Effects/Footsteps/catwalk4.ogg diff --git a/Resources/Audio/effects/footsteps/catwalk5.ogg b/Resources/Audio/Effects/Footsteps/catwalk5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/catwalk5.ogg rename to Resources/Audio/Effects/Footsteps/catwalk5.ogg diff --git a/Resources/Audio/effects/footsteps/clownstep1.ogg b/Resources/Audio/Effects/Footsteps/clownstep1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/clownstep1.ogg rename to Resources/Audio/Effects/Footsteps/clownstep1.ogg diff --git a/Resources/Audio/effects/footsteps/clownstep2.ogg b/Resources/Audio/Effects/Footsteps/clownstep2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/clownstep2.ogg rename to Resources/Audio/Effects/Footsteps/clownstep2.ogg diff --git a/Resources/Audio/effects/footsteps/floor1.ogg b/Resources/Audio/Effects/Footsteps/floor1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/floor1.ogg rename to Resources/Audio/Effects/Footsteps/floor1.ogg diff --git a/Resources/Audio/effects/footsteps/floor2.ogg b/Resources/Audio/Effects/Footsteps/floor2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/floor2.ogg rename to Resources/Audio/Effects/Footsteps/floor2.ogg diff --git a/Resources/Audio/effects/footsteps/floor3.ogg b/Resources/Audio/Effects/Footsteps/floor3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/floor3.ogg rename to Resources/Audio/Effects/Footsteps/floor3.ogg diff --git a/Resources/Audio/effects/footsteps/floor4.ogg b/Resources/Audio/Effects/Footsteps/floor4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/floor4.ogg rename to Resources/Audio/Effects/Footsteps/floor4.ogg diff --git a/Resources/Audio/effects/footsteps/floor5.ogg b/Resources/Audio/Effects/Footsteps/floor5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/floor5.ogg rename to Resources/Audio/Effects/Footsteps/floor5.ogg diff --git a/Resources/Audio/effects/footsteps/hull1.ogg b/Resources/Audio/Effects/Footsteps/hull1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/hull1.ogg rename to Resources/Audio/Effects/Footsteps/hull1.ogg diff --git a/Resources/Audio/effects/footsteps/hull2.ogg b/Resources/Audio/Effects/Footsteps/hull2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/hull2.ogg rename to Resources/Audio/Effects/Footsteps/hull2.ogg diff --git a/Resources/Audio/effects/footsteps/hull3.ogg b/Resources/Audio/Effects/Footsteps/hull3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/hull3.ogg rename to Resources/Audio/Effects/Footsteps/hull3.ogg diff --git a/Resources/Audio/effects/footsteps/hull4.ogg b/Resources/Audio/Effects/Footsteps/hull4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/hull4.ogg rename to Resources/Audio/Effects/Footsteps/hull4.ogg diff --git a/Resources/Audio/effects/footsteps/hull5.ogg b/Resources/Audio/Effects/Footsteps/hull5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/hull5.ogg rename to Resources/Audio/Effects/Footsteps/hull5.ogg diff --git a/Resources/Audio/effects/footsteps/plating1.ogg b/Resources/Audio/Effects/Footsteps/plating1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/plating1.ogg rename to Resources/Audio/Effects/Footsteps/plating1.ogg diff --git a/Resources/Audio/effects/footsteps/plating2.ogg b/Resources/Audio/Effects/Footsteps/plating2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/plating2.ogg rename to Resources/Audio/Effects/Footsteps/plating2.ogg diff --git a/Resources/Audio/effects/footsteps/plating3.ogg b/Resources/Audio/Effects/Footsteps/plating3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/plating3.ogg rename to Resources/Audio/Effects/Footsteps/plating3.ogg diff --git a/Resources/Audio/effects/footsteps/plating4.ogg b/Resources/Audio/Effects/Footsteps/plating4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/plating4.ogg rename to Resources/Audio/Effects/Footsteps/plating4.ogg diff --git a/Resources/Audio/effects/footsteps/plating5.ogg b/Resources/Audio/Effects/Footsteps/plating5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/plating5.ogg rename to Resources/Audio/Effects/Footsteps/plating5.ogg diff --git a/Resources/Audio/effects/footsteps/snowstep.ogg b/Resources/Audio/Effects/Footsteps/snowstep.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/snowstep.ogg rename to Resources/Audio/Effects/Footsteps/snowstep.ogg diff --git a/Resources/Audio/effects/footsteps/sources.txt b/Resources/Audio/Effects/Footsteps/sources.txt similarity index 100% rename from Resources/Audio/effects/footsteps/sources.txt rename to Resources/Audio/Effects/Footsteps/sources.txt diff --git a/Resources/Audio/effects/footsteps/suitstep1.ogg b/Resources/Audio/Effects/Footsteps/suitstep1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/suitstep1.ogg rename to Resources/Audio/Effects/Footsteps/suitstep1.ogg diff --git a/Resources/Audio/effects/footsteps/suitstep2.ogg b/Resources/Audio/Effects/Footsteps/suitstep2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/suitstep2.ogg rename to Resources/Audio/Effects/Footsteps/suitstep2.ogg diff --git a/Resources/Audio/effects/footsteps/tile1.wav b/Resources/Audio/Effects/Footsteps/tile1.wav similarity index 100% rename from Resources/Audio/effects/footsteps/tile1.wav rename to Resources/Audio/Effects/Footsteps/tile1.wav diff --git a/Resources/Audio/effects/footsteps/tile2.wav b/Resources/Audio/Effects/Footsteps/tile2.wav similarity index 100% rename from Resources/Audio/effects/footsteps/tile2.wav rename to Resources/Audio/Effects/Footsteps/tile2.wav diff --git a/Resources/Audio/effects/footsteps/tile3.wav b/Resources/Audio/Effects/Footsteps/tile3.wav similarity index 100% rename from Resources/Audio/effects/footsteps/tile3.wav rename to Resources/Audio/Effects/Footsteps/tile3.wav diff --git a/Resources/Audio/effects/footsteps/tile4.wav b/Resources/Audio/Effects/Footsteps/tile4.wav similarity index 100% rename from Resources/Audio/effects/footsteps/tile4.wav rename to Resources/Audio/Effects/Footsteps/tile4.wav diff --git a/Resources/Audio/effects/footsteps/wood1.ogg b/Resources/Audio/Effects/Footsteps/wood1.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/wood1.ogg rename to Resources/Audio/Effects/Footsteps/wood1.ogg diff --git a/Resources/Audio/effects/footsteps/wood2.ogg b/Resources/Audio/Effects/Footsteps/wood2.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/wood2.ogg rename to Resources/Audio/Effects/Footsteps/wood2.ogg diff --git a/Resources/Audio/effects/footsteps/wood3.ogg b/Resources/Audio/Effects/Footsteps/wood3.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/wood3.ogg rename to Resources/Audio/Effects/Footsteps/wood3.ogg diff --git a/Resources/Audio/effects/footsteps/wood4.ogg b/Resources/Audio/Effects/Footsteps/wood4.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/wood4.ogg rename to Resources/Audio/Effects/Footsteps/wood4.ogg diff --git a/Resources/Audio/effects/footsteps/wood5.ogg b/Resources/Audio/Effects/Footsteps/wood5.ogg similarity index 100% rename from Resources/Audio/effects/footsteps/wood5.ogg rename to Resources/Audio/Effects/Footsteps/wood5.ogg diff --git a/Resources/Audio/effects/alert.ogg b/Resources/Audio/Effects/alert.ogg similarity index 100% rename from Resources/Audio/effects/alert.ogg rename to Resources/Audio/Effects/alert.ogg diff --git a/Resources/Audio/effects/bodyfall1.ogg b/Resources/Audio/Effects/bodyfall1.ogg similarity index 100% rename from Resources/Audio/effects/bodyfall1.ogg rename to Resources/Audio/Effects/bodyfall1.ogg diff --git a/Resources/Audio/effects/bodyfall2.ogg b/Resources/Audio/Effects/bodyfall2.ogg similarity index 100% rename from Resources/Audio/effects/bodyfall2.ogg rename to Resources/Audio/Effects/bodyfall2.ogg diff --git a/Resources/Audio/effects/bodyfall3.ogg b/Resources/Audio/Effects/bodyfall3.ogg similarity index 100% rename from Resources/Audio/effects/bodyfall3.ogg rename to Resources/Audio/Effects/bodyfall3.ogg diff --git a/Resources/Audio/effects/bodyfall4.ogg b/Resources/Audio/Effects/bodyfall4.ogg similarity index 100% rename from Resources/Audio/effects/bodyfall4.ogg rename to Resources/Audio/Effects/bodyfall4.ogg diff --git a/Resources/Audio/effects/buckle.ogg b/Resources/Audio/Effects/buckle.ogg similarity index 100% rename from Resources/Audio/effects/buckle.ogg rename to Resources/Audio/Effects/buckle.ogg diff --git a/Resources/Audio/effects/countdown.ogg b/Resources/Audio/Effects/countdown.ogg similarity index 100% rename from Resources/Audio/effects/countdown.ogg rename to Resources/Audio/Effects/countdown.ogg diff --git a/Resources/Audio/effects/error.ogg b/Resources/Audio/Effects/error.ogg similarity index 100% rename from Resources/Audio/effects/error.ogg rename to Resources/Audio/Effects/error.ogg diff --git a/Resources/Audio/effects/explosion.ogg b/Resources/Audio/Effects/explosion.ogg similarity index 100% rename from Resources/Audio/effects/explosion.ogg rename to Resources/Audio/Effects/explosion.ogg diff --git a/Resources/Audio/effects/flash_bang.ogg b/Resources/Audio/Effects/flash_bang.ogg similarity index 100% rename from Resources/Audio/effects/flash_bang.ogg rename to Resources/Audio/Effects/flash_bang.ogg diff --git a/Resources/Audio/effects/gen_hit.ogg b/Resources/Audio/Effects/gen_hit.ogg similarity index 100% rename from Resources/Audio/effects/gen_hit.ogg rename to Resources/Audio/Effects/gen_hit.ogg diff --git a/Resources/Audio/effects/glassbreak1.ogg b/Resources/Audio/Effects/glassbreak1.ogg similarity index 100% rename from Resources/Audio/effects/glassbreak1.ogg rename to Resources/Audio/Effects/glassbreak1.ogg diff --git a/Resources/Audio/effects/glassbreak2.ogg b/Resources/Audio/Effects/glassbreak2.ogg similarity index 100% rename from Resources/Audio/effects/glassbreak2.ogg rename to Resources/Audio/Effects/glassbreak2.ogg diff --git a/Resources/Audio/effects/glassbreak3.ogg b/Resources/Audio/Effects/glassbreak3.ogg similarity index 100% rename from Resources/Audio/effects/glassbreak3.ogg rename to Resources/Audio/Effects/glassbreak3.ogg diff --git a/Resources/Audio/effects/kaching.ogg b/Resources/Audio/Effects/kaching.ogg similarity index 100% rename from Resources/Audio/effects/kaching.ogg rename to Resources/Audio/Effects/kaching.ogg diff --git a/Resources/Audio/effects/lightburn.ogg b/Resources/Audio/Effects/lightburn.ogg similarity index 100% rename from Resources/Audio/effects/lightburn.ogg rename to Resources/Audio/Effects/lightburn.ogg diff --git a/Resources/Audio/effects/metalbreak.ogg b/Resources/Audio/Effects/metalbreak.ogg similarity index 100% rename from Resources/Audio/effects/metalbreak.ogg rename to Resources/Audio/Effects/metalbreak.ogg diff --git a/Resources/Audio/effects/multitool_pulse.ogg b/Resources/Audio/Effects/multitool_pulse.ogg similarity index 100% rename from Resources/Audio/effects/multitool_pulse.ogg rename to Resources/Audio/Effects/multitool_pulse.ogg diff --git a/Resources/Audio/effects/plant_rustle.ogg b/Resources/Audio/Effects/plant_rustle.ogg similarity index 100% rename from Resources/Audio/effects/plant_rustle.ogg rename to Resources/Audio/Effects/plant_rustle.ogg diff --git a/Resources/Audio/effects/sparks1.ogg b/Resources/Audio/Effects/sparks1.ogg similarity index 100% rename from Resources/Audio/effects/sparks1.ogg rename to Resources/Audio/Effects/sparks1.ogg diff --git a/Resources/Audio/effects/sparks2.ogg b/Resources/Audio/Effects/sparks2.ogg similarity index 100% rename from Resources/Audio/effects/sparks2.ogg rename to Resources/Audio/Effects/sparks2.ogg diff --git a/Resources/Audio/effects/sparks3.ogg b/Resources/Audio/Effects/sparks3.ogg similarity index 100% rename from Resources/Audio/effects/sparks3.ogg rename to Resources/Audio/Effects/sparks3.ogg diff --git a/Resources/Audio/effects/sparks4.ogg b/Resources/Audio/Effects/sparks4.ogg similarity index 100% rename from Resources/Audio/effects/sparks4.ogg rename to Resources/Audio/Effects/sparks4.ogg diff --git a/Resources/Audio/effects/teleport_arrival.ogg b/Resources/Audio/Effects/teleport_arrival.ogg similarity index 100% rename from Resources/Audio/effects/teleport_arrival.ogg rename to Resources/Audio/Effects/teleport_arrival.ogg diff --git a/Resources/Audio/effects/teleport_departure.ogg b/Resources/Audio/Effects/teleport_departure.ogg similarity index 100% rename from Resources/Audio/effects/teleport_departure.ogg rename to Resources/Audio/Effects/teleport_departure.ogg diff --git a/Resources/Audio/effects/thudswoosh.ogg b/Resources/Audio/Effects/thudswoosh.ogg similarity index 100% rename from Resources/Audio/effects/thudswoosh.ogg rename to Resources/Audio/Effects/thudswoosh.ogg diff --git a/Resources/Audio/effects/unbuckle.ogg b/Resources/Audio/Effects/unbuckle.ogg similarity index 100% rename from Resources/Audio/effects/unbuckle.ogg rename to Resources/Audio/Effects/unbuckle.ogg diff --git a/Resources/Audio/effects/zzzt.ogg b/Resources/Audio/Effects/zzzt.ogg similarity index 100% rename from Resources/Audio/effects/zzzt.ogg rename to Resources/Audio/Effects/zzzt.ogg diff --git a/Resources/Audio/items/dice/dice1.ogg b/Resources/Audio/Items/Dice/dice1.ogg similarity index 100% rename from Resources/Audio/items/dice/dice1.ogg rename to Resources/Audio/Items/Dice/dice1.ogg diff --git a/Resources/Audio/items/dice/dice2.ogg b/Resources/Audio/Items/Dice/dice2.ogg similarity index 100% rename from Resources/Audio/items/dice/dice2.ogg rename to Resources/Audio/Items/Dice/dice2.ogg diff --git a/Resources/Audio/items/dice/dice3.ogg b/Resources/Audio/Items/Dice/dice3.ogg similarity index 100% rename from Resources/Audio/items/dice/dice3.ogg rename to Resources/Audio/Items/Dice/dice3.ogg diff --git a/Resources/Audio/items/dice/dice4.ogg b/Resources/Audio/Items/Dice/dice4.ogg similarity index 100% rename from Resources/Audio/items/dice/dice4.ogg rename to Resources/Audio/Items/Dice/dice4.ogg diff --git a/Resources/Audio/items/dice/dice5.ogg b/Resources/Audio/Items/Dice/dice5.ogg similarity index 100% rename from Resources/Audio/items/dice/dice5.ogg rename to Resources/Audio/Items/Dice/dice5.ogg diff --git a/Resources/Audio/items/dice/dice6.ogg b/Resources/Audio/Items/Dice/dice6.ogg similarity index 100% rename from Resources/Audio/items/dice/dice6.ogg rename to Resources/Audio/Items/Dice/dice6.ogg diff --git a/Resources/Audio/items/dice/dice7.ogg b/Resources/Audio/Items/Dice/dice7.ogg similarity index 100% rename from Resources/Audio/items/dice/dice7.ogg rename to Resources/Audio/Items/Dice/dice7.ogg diff --git a/Resources/Audio/items/mining/pickaxe.ogg b/Resources/Audio/Items/Mining/pickaxe.ogg similarity index 100% rename from Resources/Audio/items/mining/pickaxe.ogg rename to Resources/Audio/Items/Mining/pickaxe.ogg diff --git a/Resources/Audio/items/toys/bee.ogg b/Resources/Audio/Items/Toys/bee.ogg similarity index 100% rename from Resources/Audio/items/toys/bee.ogg rename to Resources/Audio/Items/Toys/bee.ogg diff --git a/Resources/Audio/items/toys/hellothere.ogg b/Resources/Audio/Items/Toys/hellothere.ogg similarity index 100% rename from Resources/Audio/items/toys/hellothere.ogg rename to Resources/Audio/Items/Toys/hellothere.ogg diff --git a/Resources/Audio/items/toys/helpme.ogg b/Resources/Audio/Items/Toys/helpme.ogg similarity index 100% rename from Resources/Audio/items/toys/helpme.ogg rename to Resources/Audio/Items/Toys/helpme.ogg diff --git a/Resources/Audio/items/toys/ian.ogg b/Resources/Audio/Items/Toys/ian.ogg similarity index 100% rename from Resources/Audio/items/toys/ian.ogg rename to Resources/Audio/Items/Toys/ian.ogg diff --git a/Resources/Audio/items/toys/imsorry.ogg b/Resources/Audio/Items/Toys/imsorry.ogg similarity index 100% rename from Resources/Audio/items/toys/imsorry.ogg rename to Resources/Audio/Items/Toys/imsorry.ogg diff --git a/Resources/Audio/items/toys/meow1.ogg b/Resources/Audio/Items/Toys/meow1.ogg similarity index 100% rename from Resources/Audio/items/toys/meow1.ogg rename to Resources/Audio/Items/Toys/meow1.ogg diff --git a/Resources/Audio/items/toys/mousesqueek.ogg b/Resources/Audio/Items/Toys/mousesqueek.ogg similarity index 100% rename from Resources/Audio/items/toys/mousesqueek.ogg rename to Resources/Audio/Items/Toys/mousesqueek.ogg diff --git a/Resources/Audio/items/toys/rattle.ogg b/Resources/Audio/Items/Toys/rattle.ogg similarity index 100% rename from Resources/Audio/items/toys/rattle.ogg rename to Resources/Audio/Items/Toys/rattle.ogg diff --git a/Resources/Audio/items/toys/thankyou.ogg b/Resources/Audio/Items/Toys/thankyou.ogg similarity index 100% rename from Resources/Audio/items/toys/thankyou.ogg rename to Resources/Audio/Items/Toys/thankyou.ogg diff --git a/Resources/Audio/items/toys/toysqueak1.ogg b/Resources/Audio/Items/Toys/toysqueak1.ogg similarity index 100% rename from Resources/Audio/items/toys/toysqueak1.ogg rename to Resources/Audio/Items/Toys/toysqueak1.ogg diff --git a/Resources/Audio/items/toys/toysqueak2.ogg b/Resources/Audio/Items/Toys/toysqueak2.ogg similarity index 100% rename from Resources/Audio/items/toys/toysqueak2.ogg rename to Resources/Audio/Items/Toys/toysqueak2.ogg diff --git a/Resources/Audio/items/toys/toysqueak3.ogg b/Resources/Audio/Items/Toys/toysqueak3.ogg similarity index 100% rename from Resources/Audio/items/toys/toysqueak3.ogg rename to Resources/Audio/Items/Toys/toysqueak3.ogg diff --git a/Resources/Audio/items/toys/verygood.ogg b/Resources/Audio/Items/Toys/verygood.ogg similarity index 100% rename from Resources/Audio/items/toys/verygood.ogg rename to Resources/Audio/Items/Toys/verygood.ogg diff --git a/Resources/Audio/items/bikehorn.ogg b/Resources/Audio/Items/bikehorn.ogg similarity index 100% rename from Resources/Audio/items/bikehorn.ogg rename to Resources/Audio/Items/bikehorn.ogg diff --git a/Resources/Audio/items/bottle_open1.ogg b/Resources/Audio/Items/bottle_open1.ogg similarity index 100% rename from Resources/Audio/items/bottle_open1.ogg rename to Resources/Audio/Items/bottle_open1.ogg diff --git a/Resources/Audio/items/can_open1.ogg b/Resources/Audio/Items/can_open1.ogg similarity index 100% rename from Resources/Audio/items/can_open1.ogg rename to Resources/Audio/Items/can_open1.ogg diff --git a/Resources/Audio/items/can_open2.ogg b/Resources/Audio/Items/can_open2.ogg similarity index 100% rename from Resources/Audio/items/can_open2.ogg rename to Resources/Audio/Items/can_open2.ogg diff --git a/Resources/Audio/items/can_open3.ogg b/Resources/Audio/Items/can_open3.ogg similarity index 100% rename from Resources/Audio/items/can_open3.ogg rename to Resources/Audio/Items/can_open3.ogg diff --git a/Resources/Audio/items/canopen.ogg b/Resources/Audio/Items/canopen.ogg similarity index 100% rename from Resources/Audio/items/canopen.ogg rename to Resources/Audio/Items/canopen.ogg diff --git a/Resources/Audio/items/change_drill.ogg b/Resources/Audio/Items/change_drill.ogg similarity index 100% rename from Resources/Audio/items/change_drill.ogg rename to Resources/Audio/Items/change_drill.ogg diff --git a/Resources/Audio/items/change_jaws.ogg b/Resources/Audio/Items/change_jaws.ogg similarity index 100% rename from Resources/Audio/items/change_jaws.ogg rename to Resources/Audio/Items/change_jaws.ogg diff --git a/Resources/Audio/items/crowbar.ogg b/Resources/Audio/Items/crowbar.ogg similarity index 100% rename from Resources/Audio/items/crowbar.ogg rename to Resources/Audio/Items/crowbar.ogg diff --git a/Resources/Audio/items/deconstruct.ogg b/Resources/Audio/Items/deconstruct.ogg similarity index 100% rename from Resources/Audio/items/deconstruct.ogg rename to Resources/Audio/Items/deconstruct.ogg diff --git a/Resources/Audio/items/drill_hit.ogg b/Resources/Audio/Items/drill_hit.ogg similarity index 100% rename from Resources/Audio/items/drill_hit.ogg rename to Resources/Audio/Items/drill_hit.ogg diff --git a/Resources/Audio/items/drill_use.ogg b/Resources/Audio/Items/drill_use.ogg similarity index 100% rename from Resources/Audio/items/drill_use.ogg rename to Resources/Audio/Items/drill_use.ogg diff --git a/Resources/Audio/items/drink.ogg b/Resources/Audio/Items/drink.ogg similarity index 100% rename from Resources/Audio/items/drink.ogg rename to Resources/Audio/Items/drink.ogg diff --git a/Resources/Audio/items/eatfood.ogg b/Resources/Audio/Items/eatfood.ogg similarity index 100% rename from Resources/Audio/items/eatfood.ogg rename to Resources/Audio/Items/eatfood.ogg diff --git a/Resources/Audio/items/flashlight_toggle.ogg b/Resources/Audio/Items/flashlight_toggle.ogg similarity index 100% rename from Resources/Audio/items/flashlight_toggle.ogg rename to Resources/Audio/Items/flashlight_toggle.ogg diff --git a/Resources/Audio/items/genhit.ogg b/Resources/Audio/Items/genhit.ogg similarity index 100% rename from Resources/Audio/items/genhit.ogg rename to Resources/Audio/Items/genhit.ogg diff --git a/Resources/Audio/items/jaws_cut.ogg b/Resources/Audio/Items/jaws_cut.ogg similarity index 100% rename from Resources/Audio/items/jaws_cut.ogg rename to Resources/Audio/Items/jaws_cut.ogg diff --git a/Resources/Audio/items/jaws_pry.ogg b/Resources/Audio/Items/jaws_pry.ogg similarity index 100% rename from Resources/Audio/items/jaws_pry.ogg rename to Resources/Audio/Items/jaws_pry.ogg diff --git a/Resources/Audio/items/lighter1.ogg b/Resources/Audio/Items/lighter1.ogg similarity index 100% rename from Resources/Audio/items/lighter1.ogg rename to Resources/Audio/Items/lighter1.ogg diff --git a/Resources/Audio/items/lighter2.ogg b/Resources/Audio/Items/lighter2.ogg similarity index 100% rename from Resources/Audio/items/lighter2.ogg rename to Resources/Audio/Items/lighter2.ogg diff --git a/Resources/Audio/Guns/Cock/pistol_cock.ogg b/Resources/Audio/Items/pistol_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/pistol_cock.ogg rename to Resources/Audio/Items/pistol_cock.ogg diff --git a/Resources/Audio/Guns/MagIn/pistol_magin.ogg b/Resources/Audio/Items/pistol_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/pistol_magin.ogg rename to Resources/Audio/Items/pistol_magin.ogg diff --git a/Resources/Audio/Guns/MagOut/pistol_magout.ogg b/Resources/Audio/Items/pistol_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/pistol_magout.ogg rename to Resources/Audio/Items/pistol_magout.ogg diff --git a/Resources/Audio/items/ratchet.ogg b/Resources/Audio/Items/ratchet.ogg similarity index 100% rename from Resources/Audio/items/ratchet.ogg rename to Resources/Audio/Items/ratchet.ogg diff --git a/Resources/Audio/items/screwdriver.ogg b/Resources/Audio/Items/screwdriver.ogg similarity index 100% rename from Resources/Audio/items/screwdriver.ogg rename to Resources/Audio/Items/screwdriver.ogg diff --git a/Resources/Audio/items/screwdriver2.ogg b/Resources/Audio/Items/screwdriver2.ogg similarity index 100% rename from Resources/Audio/items/screwdriver2.ogg rename to Resources/Audio/Items/screwdriver2.ogg diff --git a/Resources/Audio/items/skub.ogg b/Resources/Audio/Items/skub.ogg similarity index 100% rename from Resources/Audio/items/skub.ogg rename to Resources/Audio/Items/skub.ogg diff --git a/Resources/Audio/items/snap.ogg b/Resources/Audio/Items/snap.ogg similarity index 100% rename from Resources/Audio/items/snap.ogg rename to Resources/Audio/Items/snap.ogg diff --git a/Resources/Audio/items/welder.ogg b/Resources/Audio/Items/welder.ogg similarity index 100% rename from Resources/Audio/items/welder.ogg rename to Resources/Audio/Items/welder.ogg diff --git a/Resources/Audio/items/welder2.ogg b/Resources/Audio/Items/welder2.ogg similarity index 100% rename from Resources/Audio/items/welder2.ogg rename to Resources/Audio/Items/welder2.ogg diff --git a/Resources/Audio/items/wirecutter.ogg b/Resources/Audio/Items/wirecutter.ogg similarity index 100% rename from Resources/Audio/items/wirecutter.ogg rename to Resources/Audio/Items/wirecutter.ogg diff --git a/Resources/Audio/items/zip.ogg b/Resources/Audio/Items/zip.ogg similarity index 100% rename from Resources/Audio/items/zip.ogg rename to Resources/Audio/Items/zip.ogg diff --git a/Resources/Audio/machines/keyboard/keyboard1.ogg b/Resources/Audio/Machines/Keyboard/keyboard1.ogg similarity index 100% rename from Resources/Audio/machines/keyboard/keyboard1.ogg rename to Resources/Audio/Machines/Keyboard/keyboard1.ogg diff --git a/Resources/Audio/machines/keyboard/keyboard2.ogg b/Resources/Audio/Machines/Keyboard/keyboard2.ogg similarity index 100% rename from Resources/Audio/machines/keyboard/keyboard2.ogg rename to Resources/Audio/Machines/Keyboard/keyboard2.ogg diff --git a/Resources/Audio/machines/keyboard/keyboard3.ogg b/Resources/Audio/Machines/Keyboard/keyboard3.ogg similarity index 100% rename from Resources/Audio/machines/keyboard/keyboard3.ogg rename to Resources/Audio/Machines/Keyboard/keyboard3.ogg diff --git a/Resources/Audio/machines/keyboard/keyboard4.ogg b/Resources/Audio/Machines/Keyboard/keyboard4.ogg similarity index 100% rename from Resources/Audio/machines/keyboard/keyboard4.ogg rename to Resources/Audio/Machines/Keyboard/keyboard4.ogg diff --git a/Resources/Audio/machines/airlock_close.ogg b/Resources/Audio/Machines/airlock_close.ogg similarity index 100% rename from Resources/Audio/machines/airlock_close.ogg rename to Resources/Audio/Machines/airlock_close.ogg diff --git a/Resources/Audio/machines/airlock_creaking.ogg b/Resources/Audio/Machines/airlock_creaking.ogg similarity index 100% rename from Resources/Audio/machines/airlock_creaking.ogg rename to Resources/Audio/Machines/airlock_creaking.ogg diff --git a/Resources/Audio/machines/airlock_deny.ogg b/Resources/Audio/Machines/airlock_deny.ogg similarity index 100% rename from Resources/Audio/machines/airlock_deny.ogg rename to Resources/Audio/Machines/airlock_deny.ogg diff --git a/Resources/Audio/machines/airlock_ext_close.ogg b/Resources/Audio/Machines/airlock_ext_close.ogg similarity index 100% rename from Resources/Audio/machines/airlock_ext_close.ogg rename to Resources/Audio/Machines/airlock_ext_close.ogg diff --git a/Resources/Audio/machines/airlock_ext_open.ogg b/Resources/Audio/Machines/airlock_ext_open.ogg similarity index 100% rename from Resources/Audio/machines/airlock_ext_open.ogg rename to Resources/Audio/Machines/airlock_ext_open.ogg diff --git a/Resources/Audio/machines/airlock_open.ogg b/Resources/Audio/Machines/airlock_open.ogg similarity index 100% rename from Resources/Audio/machines/airlock_open.ogg rename to Resources/Audio/Machines/airlock_open.ogg diff --git a/Resources/Audio/machines/boltsdown.ogg b/Resources/Audio/Machines/boltsdown.ogg similarity index 100% rename from Resources/Audio/machines/boltsdown.ogg rename to Resources/Audio/Machines/boltsdown.ogg diff --git a/Resources/Audio/machines/boltsup.ogg b/Resources/Audio/Machines/boltsup.ogg similarity index 100% rename from Resources/Audio/machines/boltsup.ogg rename to Resources/Audio/Machines/boltsup.ogg diff --git a/Resources/Audio/machines/button.ogg b/Resources/Audio/Machines/button.ogg similarity index 100% rename from Resources/Audio/machines/button.ogg rename to Resources/Audio/Machines/button.ogg diff --git a/Resources/Audio/machines/closetclose.ogg b/Resources/Audio/Machines/closetclose.ogg similarity index 100% rename from Resources/Audio/machines/closetclose.ogg rename to Resources/Audio/Machines/closetclose.ogg diff --git a/Resources/Audio/machines/closetopen.ogg b/Resources/Audio/Machines/closetopen.ogg similarity index 100% rename from Resources/Audio/machines/closetopen.ogg rename to Resources/Audio/Machines/closetopen.ogg diff --git a/Resources/Audio/machines/door_lock_off.ogg b/Resources/Audio/Machines/door_lock_off.ogg similarity index 100% rename from Resources/Audio/machines/door_lock_off.ogg rename to Resources/Audio/Machines/door_lock_off.ogg diff --git a/Resources/Audio/machines/door_lock_on.ogg b/Resources/Audio/Machines/door_lock_on.ogg similarity index 100% rename from Resources/Audio/machines/door_lock_on.ogg rename to Resources/Audio/Machines/door_lock_on.ogg diff --git a/Resources/Audio/machines/id_swipe.ogg b/Resources/Audio/Machines/id_swipe.ogg similarity index 100% rename from Resources/Audio/machines/id_swipe.ogg rename to Resources/Audio/Machines/id_swipe.ogg diff --git a/Resources/Audio/machines/light_tube_on.ogg b/Resources/Audio/Machines/light_tube_on.ogg similarity index 100% rename from Resources/Audio/machines/light_tube_on.ogg rename to Resources/Audio/Machines/light_tube_on.ogg diff --git a/Resources/Audio/machines/lockenable.ogg b/Resources/Audio/Machines/lockenable.ogg similarity index 100% rename from Resources/Audio/machines/lockenable.ogg rename to Resources/Audio/Machines/lockenable.ogg diff --git a/Resources/Audio/machines/lockreset.ogg b/Resources/Audio/Machines/lockreset.ogg similarity index 100% rename from Resources/Audio/machines/lockreset.ogg rename to Resources/Audio/Machines/lockreset.ogg diff --git a/Resources/Audio/machines/machine_switch.ogg b/Resources/Audio/Machines/machine_switch.ogg similarity index 100% rename from Resources/Audio/machines/machine_switch.ogg rename to Resources/Audio/Machines/machine_switch.ogg diff --git a/Resources/Audio/machines/microwave_done_beep.ogg b/Resources/Audio/Machines/microwave_done_beep.ogg similarity index 100% rename from Resources/Audio/machines/microwave_done_beep.ogg rename to Resources/Audio/Machines/microwave_done_beep.ogg diff --git a/Resources/Audio/machines/microwave_loop.ogg b/Resources/Audio/Machines/microwave_loop.ogg similarity index 100% rename from Resources/Audio/machines/microwave_loop.ogg rename to Resources/Audio/Machines/microwave_loop.ogg diff --git a/Resources/Audio/machines/microwave_start_beep.ogg b/Resources/Audio/Machines/microwave_start_beep.ogg similarity index 100% rename from Resources/Audio/machines/microwave_start_beep.ogg rename to Resources/Audio/Machines/microwave_start_beep.ogg diff --git a/Resources/Audio/machines/screwdriverclose.ogg b/Resources/Audio/Machines/screwdriverclose.ogg similarity index 100% rename from Resources/Audio/machines/screwdriverclose.ogg rename to Resources/Audio/Machines/screwdriverclose.ogg diff --git a/Resources/Audio/machines/screwdriveropen.ogg b/Resources/Audio/Machines/screwdriveropen.ogg similarity index 100% rename from Resources/Audio/machines/screwdriveropen.ogg rename to Resources/Audio/Machines/screwdriveropen.ogg diff --git a/Resources/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2 similarity index 100% rename from Resources/MidiCustom/space-station-14.sf2 rename to Resources/Audio/MidiCustom/space-station-14.sf2 diff --git a/Resources/Audio/Guns/Bolt/lmg_bolt_closed.ogg b/Resources/Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg similarity index 100% rename from Resources/Audio/Guns/Bolt/lmg_bolt_closed.ogg rename to Resources/Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg diff --git a/Resources/Audio/Guns/Bolt/lmg_bolt_open.ogg b/Resources/Audio/Weapons/Guns/Bolt/lmg_bolt_open.ogg similarity index 100% rename from Resources/Audio/Guns/Bolt/lmg_bolt_open.ogg rename to Resources/Audio/Weapons/Guns/Bolt/lmg_bolt_open.ogg diff --git a/Resources/Audio/Guns/Bolt/rifle_bolt_closed.ogg b/Resources/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg similarity index 100% rename from Resources/Audio/Guns/Bolt/rifle_bolt_closed.ogg rename to Resources/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg diff --git a/Resources/Audio/Guns/Bolt/rifle_bolt_open.ogg b/Resources/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg similarity index 100% rename from Resources/Audio/Guns/Bolt/rifle_bolt_open.ogg rename to Resources/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg diff --git a/Resources/Audio/Guns/Casings/casing_fall_1.ogg b/Resources/Audio/Weapons/Guns/Casings/casing_fall_1.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casing_fall_1.ogg rename to Resources/Audio/Weapons/Guns/Casings/casing_fall_1.ogg diff --git a/Resources/Audio/Guns/Casings/casing_fall_2.ogg b/Resources/Audio/Weapons/Guns/Casings/casing_fall_2.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casing_fall_2.ogg rename to Resources/Audio/Weapons/Guns/Casings/casing_fall_2.ogg diff --git a/Resources/Audio/Guns/Casings/casing_fall_3.ogg b/Resources/Audio/Weapons/Guns/Casings/casing_fall_3.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casing_fall_3.ogg rename to Resources/Audio/Weapons/Guns/Casings/casing_fall_3.ogg diff --git a/Resources/Audio/Guns/Casings/shotgun_fall.ogg b/Resources/Audio/Weapons/Guns/Casings/shotgun_fall.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/shotgun_fall.ogg rename to Resources/Audio/Weapons/Guns/Casings/shotgun_fall.ogg diff --git a/Resources/Audio/Guns/Cock/batrifle_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/batrifle_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/batrifle_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/batrifle_cock.ogg diff --git a/Resources/Audio/Guns/Cock/hpistol_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/hpistol_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/hpistol_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/hpistol_cock.ogg diff --git a/Resources/Audio/Guns/Cock/lmg_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/lmg_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/lmg_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/lmg_cock.ogg diff --git a/Resources/Audio/Guns/Cock/ltrifle_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/ltrifle_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/ltrifle_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/ltrifle_cock.ogg diff --git a/Resources/Audio/Guns/Cock/m41_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/m41_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/m41_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/m41_cock.ogg diff --git a/Resources/Audio/items/weapons/pistol_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/pistol_cock.ogg similarity index 100% rename from Resources/Audio/items/weapons/pistol_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/pistol_cock.ogg diff --git a/Resources/Audio/Guns/Cock/revolver_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/revolver_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/revolver_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/revolver_cock.ogg diff --git a/Resources/Audio/Guns/Cock/sf_rifle_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/sf_rifle_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg diff --git a/Resources/Audio/Guns/Cock/shotgun_close.ogg b/Resources/Audio/Weapons/Guns/Cock/shotgun_close.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/shotgun_close.ogg rename to Resources/Audio/Weapons/Guns/Cock/shotgun_close.ogg diff --git a/Resources/Audio/Guns/Cock/shotgun_open.ogg b/Resources/Audio/Weapons/Guns/Cock/shotgun_open.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/shotgun_open.ogg rename to Resources/Audio/Weapons/Guns/Cock/shotgun_open.ogg diff --git a/Resources/Audio/Guns/Cock/smg_cock.ogg b/Resources/Audio/Weapons/Guns/Cock/smg_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/smg_cock.ogg rename to Resources/Audio/Weapons/Guns/Cock/smg_cock.ogg diff --git a/Resources/Audio/Guns/Empty/empty.ogg b/Resources/Audio/Weapons/Guns/Empty/empty.ogg similarity index 100% rename from Resources/Audio/Guns/Empty/empty.ogg rename to Resources/Audio/Weapons/Guns/Empty/empty.ogg diff --git a/Resources/Audio/Guns/Empty/lmg_empty.ogg b/Resources/Audio/Weapons/Guns/Empty/lmg_empty.ogg similarity index 100% rename from Resources/Audio/Guns/Empty/lmg_empty.ogg rename to Resources/Audio/Weapons/Guns/Empty/lmg_empty.ogg diff --git a/Resources/Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/lmg_empty_alarm.ogg similarity index 100% rename from Resources/Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg rename to Resources/Audio/Weapons/Guns/EmptyAlarm/lmg_empty_alarm.ogg diff --git a/Resources/Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg similarity index 100% rename from Resources/Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg rename to Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg diff --git a/Resources/Audio/Guns/Gunshots/bang.ogg b/Resources/Audio/Weapons/Guns/Gunshots/bang.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/bang.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/bang.ogg diff --git a/Resources/Audio/Guns/Gunshots/batrifle.ogg b/Resources/Audio/Weapons/Guns/Gunshots/batrifle.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/batrifle.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/batrifle.ogg diff --git a/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg b/Resources/Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/grenade_launcher.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg diff --git a/Resources/Audio/Guns/Gunshots/hpistol.ogg b/Resources/Audio/Weapons/Guns/Gunshots/hpistol.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/hpistol.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/hpistol.ogg diff --git a/Resources/Audio/Guns/Gunshots/laser.ogg b/Resources/Audio/Weapons/Guns/Gunshots/laser.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/laser.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/laser.ogg diff --git a/Resources/Audio/Guns/Gunshots/laser3.ogg b/Resources/Audio/Weapons/Guns/Gunshots/laser3.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/laser3.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/laser3.ogg diff --git a/Resources/Audio/Guns/Gunshots/laser_cannon.ogg b/Resources/Audio/Weapons/Guns/Gunshots/laser_cannon.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/laser_cannon.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/laser_cannon.ogg diff --git a/Resources/Audio/Guns/Gunshots/laser_cannon2.ogg b/Resources/Audio/Weapons/Guns/Gunshots/laser_cannon2.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/laser_cannon2.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/laser_cannon2.ogg diff --git a/Resources/Audio/Guns/Gunshots/lmg.ogg b/Resources/Audio/Weapons/Guns/Gunshots/lmg.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/lmg.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/lmg.ogg diff --git a/Resources/Audio/Guns/Gunshots/ltrifle.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ltrifle.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/ltrifle.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/ltrifle.ogg diff --git a/Resources/Audio/Guns/Gunshots/m41.ogg b/Resources/Audio/Weapons/Guns/Gunshots/m41.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/m41.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/m41.ogg diff --git a/Resources/Audio/Guns/Gunshots/pistol.ogg b/Resources/Audio/Weapons/Guns/Gunshots/pistol.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/pistol.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/pistol.ogg diff --git a/Resources/Audio/Guns/Gunshots/revolver.ogg b/Resources/Audio/Weapons/Guns/Gunshots/revolver.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/revolver.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/revolver.ogg diff --git a/Resources/Audio/Guns/Gunshots/rifle.ogg b/Resources/Audio/Weapons/Guns/Gunshots/rifle.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/rifle.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/rifle.ogg diff --git a/Resources/Audio/Guns/Gunshots/rifle2.ogg b/Resources/Audio/Weapons/Guns/Gunshots/rifle2.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/rifle2.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/rifle2.ogg diff --git a/Resources/Audio/Guns/Gunshots/rpgfire.ogg b/Resources/Audio/Weapons/Guns/Gunshots/rpgfire.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/rpgfire.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/rpgfire.ogg diff --git a/Resources/Audio/Guns/Gunshots/shotgun.ogg b/Resources/Audio/Weapons/Guns/Gunshots/shotgun.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/shotgun.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/shotgun.ogg diff --git a/Resources/Audio/Guns/Gunshots/silenced.ogg b/Resources/Audio/Weapons/Guns/Gunshots/silenced.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/silenced.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/silenced.ogg diff --git a/Resources/Audio/Guns/Gunshots/smg.ogg b/Resources/Audio/Weapons/Guns/Gunshots/smg.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/smg.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/smg.ogg diff --git a/Resources/Audio/Guns/Gunshots/sniper.ogg b/Resources/Audio/Weapons/Guns/Gunshots/sniper.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/sniper.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/sniper.ogg diff --git a/Resources/Audio/Guns/Gunshots/taser.ogg b/Resources/Audio/Weapons/Guns/Gunshots/taser.ogg similarity index 100% rename from Resources/Audio/Guns/Gunshots/taser.ogg rename to Resources/Audio/Weapons/Guns/Gunshots/taser.ogg diff --git a/Resources/Audio/Guns/Hits/bullet_hit.ogg b/Resources/Audio/Weapons/Guns/Hits/bullet_hit.ogg similarity index 100% rename from Resources/Audio/Guns/Hits/bullet_hit.ogg rename to Resources/Audio/Weapons/Guns/Hits/bullet_hit.ogg diff --git a/Resources/Audio/Guns/Hits/laser_sear_wall.ogg b/Resources/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg similarity index 100% rename from Resources/Audio/Guns/Hits/laser_sear_wall.ogg rename to Resources/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg diff --git a/Resources/Audio/Guns/Hits/snap.ogg b/Resources/Audio/Weapons/Guns/Hits/snap.ogg similarity index 100% rename from Resources/Audio/Guns/Hits/snap.ogg rename to Resources/Audio/Weapons/Guns/Hits/snap.ogg diff --git a/Resources/Audio/Guns/Hits/taser_hit.ogg b/Resources/Audio/Weapons/Guns/Hits/taser_hit.ogg similarity index 100% rename from Resources/Audio/Guns/Hits/taser_hit.ogg rename to Resources/Audio/Weapons/Guns/Hits/taser_hit.ogg diff --git a/Resources/Audio/Guns/MagIn/batrifle_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/batrifle_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/bullet_insert.ogg b/Resources/Audio/Weapons/Guns/MagIn/bullet_insert.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/bullet_insert.ogg rename to Resources/Audio/Weapons/Guns/MagIn/bullet_insert.ogg diff --git a/Resources/Audio/Guns/MagIn/bullet_insert2.ogg b/Resources/Audio/Weapons/Guns/MagIn/bullet_insert2.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/bullet_insert2.ogg rename to Resources/Audio/Weapons/Guns/MagIn/bullet_insert2.ogg diff --git a/Resources/Audio/Guns/MagIn/hpistol_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/hpistol_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/hpistol_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/hpistol_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/lmg_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/lmg_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/lmg_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/lmg_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/ltrifle_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/ltrifle_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/m41_reload.ogg b/Resources/Audio/Weapons/Guns/MagIn/m41_reload.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/m41_reload.ogg rename to Resources/Audio/Weapons/Guns/MagIn/m41_reload.ogg diff --git a/Resources/Audio/items/weapons/pistol_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/pistol_magin.ogg similarity index 100% rename from Resources/Audio/items/weapons/pistol_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/pistol_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/revolver_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/revolver_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/revolver_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/revolver_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/rifle_load.ogg b/Resources/Audio/Weapons/Guns/MagIn/rifle_load.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/rifle_load.ogg rename to Resources/Audio/Weapons/Guns/MagIn/rifle_load.ogg diff --git a/Resources/Audio/Guns/MagIn/sfrifle_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/sfrifle_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg diff --git a/Resources/Audio/Guns/MagIn/shotgun_insert.ogg b/Resources/Audio/Weapons/Guns/MagIn/shotgun_insert.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/shotgun_insert.ogg rename to Resources/Audio/Weapons/Guns/MagIn/shotgun_insert.ogg diff --git a/Resources/Audio/Guns/MagIn/smg_magin.ogg b/Resources/Audio/Weapons/Guns/MagIn/smg_magin.ogg similarity index 100% rename from Resources/Audio/Guns/MagIn/smg_magin.ogg rename to Resources/Audio/Weapons/Guns/MagIn/smg_magin.ogg diff --git a/Resources/Audio/Guns/MagOut/batrifle_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/batrifle_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/batrifle_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/batrifle_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/hpistol_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/hpistol_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/hpistol_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/hpistol_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/lmg_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/lmg_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/lmg_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/lmg_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/ltrifle_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/ltrifle_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg diff --git a/Resources/Audio/items/weapons/pistol_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/pistol_magout.ogg similarity index 100% rename from Resources/Audio/items/weapons/pistol_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/pistol_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/revolver_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/revolver_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/revolver_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/revolver_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/sfrifle_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/sfrifle_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg diff --git a/Resources/Audio/Guns/MagOut/smg_magout.ogg b/Resources/Audio/Weapons/Guns/MagOut/smg_magout.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/smg_magout.ogg rename to Resources/Audio/Weapons/Guns/MagOut/smg_magout.ogg diff --git a/Resources/Audio/Guns/Misc/revolver_spin.ogg b/Resources/Audio/Weapons/Guns/Misc/revolver_spin.ogg similarity index 100% rename from Resources/Audio/Guns/Misc/revolver_spin.ogg rename to Resources/Audio/Weapons/Guns/Misc/revolver_spin.ogg diff --git a/Resources/Audio/Guns/sources.json b/Resources/Audio/Weapons/Guns/sources.json similarity index 100% rename from Resources/Audio/Guns/sources.json rename to Resources/Audio/Weapons/Guns/sources.json diff --git a/Resources/Audio/weapons/bladeslice.ogg b/Resources/Audio/Weapons/bladeslice.ogg similarity index 100% rename from Resources/Audio/weapons/bladeslice.ogg rename to Resources/Audio/Weapons/bladeslice.ogg diff --git a/Resources/Audio/weapons/click.ogg b/Resources/Audio/Weapons/click.ogg similarity index 100% rename from Resources/Audio/weapons/click.ogg rename to Resources/Audio/Weapons/click.ogg diff --git a/Resources/Audio/weapons/drawbow2.ogg b/Resources/Audio/Weapons/drawbow2.ogg similarity index 100% rename from Resources/Audio/weapons/drawbow2.ogg rename to Resources/Audio/Weapons/drawbow2.ogg diff --git a/Resources/Audio/weapons/egloves.ogg b/Resources/Audio/Weapons/egloves.ogg similarity index 100% rename from Resources/Audio/weapons/egloves.ogg rename to Resources/Audio/Weapons/egloves.ogg diff --git a/Resources/Audio/weapons/flash.ogg b/Resources/Audio/Weapons/flash.ogg similarity index 100% rename from Resources/Audio/weapons/flash.ogg rename to Resources/Audio/Weapons/flash.ogg diff --git a/Resources/Audio/weapons/genhit1.ogg b/Resources/Audio/Weapons/genhit1.ogg similarity index 100% rename from Resources/Audio/weapons/genhit1.ogg rename to Resources/Audio/Weapons/genhit1.ogg diff --git a/Resources/Audio/weapons/genhit2.ogg b/Resources/Audio/Weapons/genhit2.ogg similarity index 100% rename from Resources/Audio/weapons/genhit2.ogg rename to Resources/Audio/Weapons/genhit2.ogg diff --git a/Resources/Audio/weapons/genhit3.ogg b/Resources/Audio/Weapons/genhit3.ogg similarity index 100% rename from Resources/Audio/weapons/genhit3.ogg rename to Resources/Audio/Weapons/genhit3.ogg diff --git a/Resources/Audio/weapons/punch1.ogg b/Resources/Audio/Weapons/punch1.ogg similarity index 100% rename from Resources/Audio/weapons/punch1.ogg rename to Resources/Audio/Weapons/punch1.ogg diff --git a/Resources/Audio/weapons/punch2.ogg b/Resources/Audio/Weapons/punch2.ogg similarity index 100% rename from Resources/Audio/weapons/punch2.ogg rename to Resources/Audio/Weapons/punch2.ogg diff --git a/Resources/Audio/weapons/punch3.ogg b/Resources/Audio/Weapons/punch3.ogg similarity index 100% rename from Resources/Audio/weapons/punch3.ogg rename to Resources/Audio/Weapons/punch3.ogg diff --git a/Resources/Audio/weapons/punch4.ogg b/Resources/Audio/Weapons/punch4.ogg similarity index 100% rename from Resources/Audio/weapons/punch4.ogg rename to Resources/Audio/Weapons/punch4.ogg diff --git a/Resources/Audio/weapons/punchmiss.ogg b/Resources/Audio/Weapons/punchmiss.ogg similarity index 100% rename from Resources/Audio/weapons/punchmiss.ogg rename to Resources/Audio/Weapons/punchmiss.ogg diff --git a/Resources/Audio/weapons/smash.ogg b/Resources/Audio/Weapons/smash.ogg similarity index 100% rename from Resources/Audio/weapons/smash.ogg rename to Resources/Audio/Weapons/smash.ogg diff --git a/Resources/CONTENT_GOES_HERE b/Resources/CONTENT_GOES_HERE deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 9f62c6c340..3eb8f2a0ef 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -8974,7 +8974,7 @@ entities: pos: 31.5,0.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/youtool.rsi + - sprite: Constructible/Power/VendingMachines/youtool.rsi type: Sprite - SerialNumber: RYNA-8760 WireSeed: 1360281528 @@ -15516,7 +15516,7 @@ entities: pos: -29.5,11.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/youtool.rsi + - sprite: Constructible/Power/VendingMachines/youtool.rsi type: Sprite - SerialNumber: RPGM-5471 WireSeed: 1742069662 @@ -15528,7 +15528,7 @@ entities: pos: -11.5,-9.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/sovietsoda.rsi + - sprite: Constructible/Power/VendingMachines/sovietsoda.rsi type: Sprite - SerialNumber: NVGJ-3894 WireSeed: 844269927 @@ -15600,7 +15600,7 @@ entities: pos: 29.5,6.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/cola.rsi + - sprite: Constructible/Power/VendingMachines/cola.rsi type: Sprite - SerialNumber: QQFJ-6186 WireSeed: 1754739504 @@ -15670,7 +15670,7 @@ entities: pos: 9.5,28.5 rot: 3.141592653589793 rad type: Transform - - sprite: Buildings/VendingMachines/snack.rsi + - sprite: Constructible/Power/VendingMachines/snack.rsi type: Sprite - SerialNumber: ETEK-6817 WireSeed: 2090195893 @@ -20927,7 +20927,7 @@ entities: pos: 31.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/engivend.rsi + - sprite: Constructible/Power/VendingMachines/engivend.rsi type: Sprite - SerialNumber: PBIP-1768 WireSeed: 1566618327 @@ -21409,7 +21409,7 @@ entities: pos: -22.5,0.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/snack.rsi + - sprite: Constructible/Power/VendingMachines/snack.rsi type: Sprite - SerialNumber: SEML-1014 WireSeed: 1521930307 @@ -21421,7 +21421,7 @@ entities: pos: -34.5,2.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/cola.rsi + - sprite: Constructible/Power/VendingMachines/cola.rsi type: Sprite - SerialNumber: OFVJ-3613 WireSeed: 681961778 @@ -22354,7 +22354,7 @@ entities: pos: 19.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/medical.rsi + - sprite: Constructible/Power/VendingMachines/medical.rsi type: Sprite - SerialNumber: ZETC-9911 WireSeed: 1806878269 @@ -22366,7 +22366,7 @@ entities: pos: 6.5,-11.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/medical.rsi + - sprite: Constructible/Power/VendingMachines/medical.rsi type: Sprite - SerialNumber: GZGK-6351 WireSeed: 2142912283 @@ -23659,7 +23659,7 @@ entities: - parent: 0 pos: 0.5,-4.5 type: Transform - - sprite: Buildings/VendingMachines/cigs.rsi + - sprite: Constructible/Power/VendingMachines/cigs.rsi type: Sprite - SerialNumber: LQQS-9626 WireSeed: 1162309017 @@ -23670,7 +23670,7 @@ entities: - parent: 0 pos: -0.5,-4.5 type: Transform - - sprite: Buildings/VendingMachines/snack.rsi + - sprite: Constructible/Power/VendingMachines/snack.rsi type: Sprite - SerialNumber: UTZI-3622 WireSeed: 241374962 @@ -23753,7 +23753,7 @@ entities: pos: 1.5,21.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/cola.rsi + - sprite: Constructible/Power/VendingMachines/cola.rsi type: Sprite - SerialNumber: UJIM-0013 WireSeed: 1599139719 @@ -23775,7 +23775,7 @@ entities: pos: 6.5,23.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/cigs.rsi + - sprite: Constructible/Power/VendingMachines/cigs.rsi type: Sprite - SerialNumber: HKLI-4112 WireSeed: 911429600 @@ -25003,7 +25003,7 @@ entities: pos: -17.5,-9.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/theater.rsi + - sprite: Constructible/Power/VendingMachines/theater.rsi type: Sprite - SerialNumber: OOCP-5021 WireSeed: 1336485199 @@ -26646,7 +26646,7 @@ entities: pos: -4.5,-7.5 rot: -1.5707963267948966 rad type: Transform - - sprite: Buildings/VendingMachines/boozeomat.rsi + - sprite: Constructible/Power/VendingMachines/boozeomat.rsi type: Sprite - SerialNumber: DHCS-0497 WireSeed: 1858375876 diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index f3a2440901..45aea33f93 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -1734,7 +1734,7 @@ entities: pos: -11.5,-0.5 rot: -1.5707963267949 rad type: Transform - - sprite: Buildings/VendingMachines/youtool.rsi + - sprite: Constructible/Power/VendingMachines/youtool.rsi type: Sprite - uid: 183 type: Generator @@ -3797,7 +3797,7 @@ entities: pos: -11.5,0.5 rot: -1.5707963267949 rad type: Transform - - sprite: Buildings/VendingMachines/engivend.rsi + - sprite: Constructible/Power/VendingMachines/engivend.rsi type: Sprite - uid: 419 type: Table @@ -6510,7 +6510,7 @@ entities: pos: 29.5,3.5 rot: 3.141592653589793 rad type: Transform - - sprite: Buildings/VendingMachines/medical.rsi + - sprite: Constructible/Power/VendingMachines/medical.rsi type: Sprite - uid: 716 type: VendingMachineMedical @@ -6519,7 +6519,7 @@ entities: pos: 27.5,-5.5 rot: 3.141592653589793 rad type: Transform - - sprite: Buildings/VendingMachines/medical.rsi + - sprite: Constructible/Power/VendingMachines/medical.rsi type: Sprite - uid: 717 type: VendingMachineMedical @@ -6528,7 +6528,7 @@ entities: pos: 25.5,-5.5 rot: 3.141592653589793 rad type: Transform - - sprite: Buildings/VendingMachines/medical.rsi + - sprite: Constructible/Power/VendingMachines/medical.rsi type: Sprite - uid: 718 type: VendingMachineWallMedical @@ -6537,7 +6537,7 @@ entities: pos: 1.5,-3.5 rot: 3.141592653589793 rad type: Transform - - sprite: Buildings/VendingMachines/wallmed.rsi + - sprite: Constructible/Power/VendingMachines/wallmed.rsi type: Sprite - uid: 719 type: MedkitFilled diff --git a/Resources/Prototypes/BodySystem/BodyParts/humanoid_parts.yml b/Resources/Prototypes/BodySystem/BodyParts/humanoid_parts.yml index 7b81552a62..6af6e71493 100644 --- a/Resources/Prototypes/BodySystem/BodyParts/humanoid_parts.yml +++ b/Resources/Prototypes/BodySystem/BodyParts/humanoid_parts.yml @@ -2,7 +2,7 @@ id: bodyPart.Torso.BasicHuman name: "human torso" plural: "human torsos" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: "torso_m" partType: Torso durability: 100 @@ -17,12 +17,11 @@ - mechanism.Liver.BasicHuman - mechanism.Kidneys.BasicHuman - - type: bodyPart id: bodyPart.Head.BasicHuman name: "human head" plural: "human heads" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: head_m partType: Head durability: 50 @@ -35,13 +34,11 @@ - mechanism.Brain.BasicHuman - mechanism.Eyes.BasicHuman - - - type: bodyPart id: bodyPart.Arm.BasicHuman name: "human arm" plural: "human arms" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: r_arm partType: Arm durability: 40 @@ -54,13 +51,11 @@ - !type:ArmLength length: 2.4 - - - type: bodyPart id: bodyPart.Hand.BasicHuman name: "human hand" plural: "human hands" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: r_hand partType: Hand durability: 30 @@ -70,12 +65,11 @@ compatibility: Biological surgeryDataType: BiologicalsurgeryDataType - - type: bodyPart id: bodyPart.Leg.BasicHuman name: "human leg" plural: "human legs" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: r_leg partType: Leg durability: 45 @@ -85,12 +79,11 @@ compatibility: Biological surgeryDataType: BiologicalsurgeryDataType - - type: bodyPart id: bodyPart.Foot.BasicHuman name: "human foot" plural: "human feet" - rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi + rsiPath: Mobs/Parts/body_human.rsi rsiState: r_foot partType: Foot durability: 30 diff --git a/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml index fff92ab72b..c1fb020f24 100644 --- a/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml +++ b/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml @@ -18,7 +18,7 @@ - type: mechanism id: mechanism.Brain.BasicHuman name: "human brain" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "brain_human" description: "The source of incredible, unending intelligence. Honk." durability: 10 @@ -28,7 +28,7 @@ - type: mechanism id: mechanism.Eyes.BasicHuman name: "human eyes" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "eyes_human" description: "Ocular organ capable of turning light into a colorful visual." durability: 10 @@ -38,7 +38,7 @@ - type: mechanism id: mechanism.Heart.BasicHuman name: "human heart" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "heart_human" description: "Pumps blood throughout a body. Essential for any entity with blood." durability: 10 @@ -48,7 +48,7 @@ - type: mechanism id: mechanism.Lungs.BasicHuman name: "human lungs" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "lungs_human" description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier." durability: 13 @@ -58,7 +58,7 @@ - type: mechanism id: mechanism.Liver.BasicHuman name: "human liver" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "liver_human" description: "Filters impurities out of a bloodstream and provides other important functionality to a human." durability: 15 @@ -68,7 +68,7 @@ - type: mechanism id: mechanism.Kidneys.BasicHuman name: "human kidneys" - rsiPath: Objects/BodySystem/Organs/basic_human.rsi + rsiPath: Mobs/Parts/organs_human.rsi rsiState: "kidneys_human" description: "Filters toxins out of a bloodstream." durability: 20 diff --git a/Resources/Prototypes/BodySystem/Surgery/surgery_tools.yml b/Resources/Prototypes/BodySystem/Surgery/surgery_tools.yml index 021fba0703..3e490290df 100644 --- a/Resources/Prototypes/BodySystem/Surgery/surgery_tools.yml +++ b/Resources/Prototypes/BodySystem/Surgery/surgery_tools.yml @@ -25,10 +25,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: scalpel - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: scalpel - type: ItemCooldown @@ -47,10 +47,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: retractor - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: retractor - type: ItemCooldown @@ -69,10 +69,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: cautery - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: cautery - type: ItemCooldown @@ -91,10 +91,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: drill - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: drill - type: ItemCooldown @@ -113,10 +113,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: bone_saw - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: bone_saw - type: ItemCooldown @@ -135,10 +135,10 @@ baseOperateTime: 3 - type: Sprite - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: hemostat - type: Icon - sprite: Objects/Surgery/surgery_tools.rsi + sprite: Objects/Specific/Medical/surgery_tools.rsi state: hemostat - type: ItemCooldown diff --git a/Resources/Prototypes/BodySystem/body_system_dropped_abstract.yml b/Resources/Prototypes/BodySystem/body_system_dropped_abstract.yml index 1653dc6de6..4ebfd084ef 100644 --- a/Resources/Prototypes/BodySystem/body_system_dropped_abstract.yml +++ b/Resources/Prototypes/BodySystem/body_system_dropped_abstract.yml @@ -6,7 +6,7 @@ components: - type: DroppedBodyPart - type: Sprite - texture: Objects\BodySystem\Organs\eyes_grey.png + texture: Mobs/Parts/Organs/eyes_grey.png - type: Icon - type: UserInterface interfaces: @@ -21,7 +21,7 @@ components: - type: DroppedMechanism - type: Sprite - texture: Objects\BodySystem\Organs\eyes_grey.png + texture: Mobs/Parts/Organs/eyes_grey.png - type: Icon - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Cargo/products.yml b/Resources/Prototypes/Catalog/Cargo/products.yml similarity index 92% rename from Resources/Prototypes/Cargo/products.yml rename to Resources/Prototypes/Catalog/Cargo/products.yml index 311e79269b..dabcd52877 100644 --- a/Resources/Prototypes/Cargo/products.yml +++ b/Resources/Prototypes/Catalog/Cargo/products.yml @@ -14,7 +14,7 @@ name: "medkit" id: cargo.Medkit description: "Everything you need to patch someone up." - icon: Objects/Medical/medkit_r.png + icon: Objects/Specific/Medical/medkit_r.png product: Medkit cost: 200 category: Medical @@ -37,7 +37,7 @@ id: cargo.lightbulb description: "Light up a room, anywhere, anytime. Electricity not included." icon: - sprite: Objects/Lighting/light_tube.rsi + sprite: Objects/Power/light_tube.rsi state: normal product: CrateLightBulb cost: 200 @@ -83,7 +83,7 @@ id: cargo.cleaver description: "That's not a knife, THAT'S a knife." icon: - sprite: Objects/Melee/cleaver.rsi + sprite: Objects/Weapons/Melee/cleaver.rsi state: butch product: CrateCleaver cost: 300 @@ -94,7 +94,7 @@ name: "fuel tank" id: cargo.fueltank description: "Movable fuel tank for welders. No boom boom." - icon: Buildings/weldtank.png + icon: Constructible/Misc/weldtank.png product: CrateFuelTank cost: 200 category: Engineering @@ -105,7 +105,7 @@ id: cargo.medscanner description: "Scans patients. First we stick this probe..." icon: - sprite: Buildings/medical_scanner.rsi + sprite: Constructible/Power/medical_scanner.rsi state: scanner_open product: CrateMedicalScanner cost: 400 diff --git a/Resources/Prototypes/LatheRecipes/medical.yml b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml similarity index 71% rename from Resources/Prototypes/LatheRecipes/medical.yml rename to Resources/Prototypes/Catalog/LatheRecipes/medical.yml index 939144a024..5ba561ec72 100644 --- a/Resources/Prototypes/LatheRecipes/medical.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: Brutepack - icon: Objects/Medical/brutepack.png + icon: Objects/Specific/Medical/brutepack.png result: Brutepack completetime: 500 materials: @@ -9,7 +9,7 @@ - type: latheRecipe id: Ointment - icon: Objects/Medical/ointment.png + icon: Objects/Specific/Medical/ointment.png result: Ointment completetime: 500 materials: diff --git a/Resources/Prototypes/LatheRecipes/misc.yml b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml similarity index 69% rename from Resources/Prototypes/LatheRecipes/misc.yml rename to Resources/Prototypes/Catalog/LatheRecipes/misc.yml index f2ab94f12a..8eaa48811e 100644 --- a/Resources/Prototypes/LatheRecipes/misc.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: LightTube - icon: Objects/Lighting/light_tube.rsi/normal.png + icon: Objects/Power/light_tube.rsi/normal.png result: LightTube completetime: 500 materials: @@ -9,7 +9,7 @@ - type: latheRecipe id: LightBulb - icon: Objects/Lighting/light_bulb.rsi/normal.png + icon: Objects/Power/light_bulb.rsi/normal.png result: LightBulb completetime: 500 materials: diff --git a/Resources/Prototypes/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml similarity index 100% rename from Resources/Prototypes/LatheRecipes/sheet.yml rename to Resources/Prototypes/Catalog/LatheRecipes/sheet.yml diff --git a/Resources/Prototypes/LatheRecipes/tools.yml b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml similarity index 87% rename from Resources/Prototypes/LatheRecipes/tools.yml rename to Resources/Prototypes/Catalog/LatheRecipes/tools.yml index 38f0139b16..87635aeb03 100644 --- a/Resources/Prototypes/LatheRecipes/tools.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/tools.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: Wirecutter - icon: Objects/Tools/wirecutter.png + icon: Objects/Tools/wirecutters.rsi/cutters-map.png result: Wirecutter completetime: 500 materials: @@ -29,7 +29,7 @@ - type: latheRecipe id: Wrench - icon: Objects/Tools/wrench.png + icon: Objects/Tools/wrench.rsi/icon.png result: Wrench completetime: 500 materials: @@ -47,7 +47,7 @@ - type: latheRecipe id: Crowbar - icon: Objects/Tools/crowbar.png + icon: Objects/Tools/crowbar.rsi/icon.png result: Crowbar completetime: 500 materials: diff --git a/Resources/Prototypes/Technologies/technologies.yml b/Resources/Prototypes/Catalog/Technologies/technologies.yml similarity index 87% rename from Resources/Prototypes/Technologies/technologies.yml rename to Resources/Prototypes/Catalog/Technologies/technologies.yml index b71f18716e..594f1c8116 100644 --- a/Resources/Prototypes/Technologies/technologies.yml +++ b/Resources/Prototypes/Catalog/Technologies/technologies.yml @@ -7,7 +7,7 @@ name: "basic research technology" id: BasicResearch description: Nanotransen basic research technologies. - icon: Buildings/research.rsi/server-on.png + icon: Constructible/Power/server.rsi/server-on.png requiredpoints: 250 # Biological Technology Tree @@ -16,7 +16,7 @@ name: "biological technology" id: BiologicalTechnology description: Investigations into the natural world. - icon: Buildings/plants.rsi/plant_1.png + icon: Constructible/Misc/potted_plants.rsi/applebush.png requiredpoints: 1000 requiredtechnologies: - BasicResearch @@ -27,7 +27,7 @@ name: "data theory" id: DataTheory description: Just like regular data, but in space! - icon: Buildings/computer.rsi/computer-datatheory.png + icon: Constructible/Power/computers.rsi/computer-datatheory.png requiredpoints: 1000 requiredtechnologies: - BasicResearch @@ -38,7 +38,7 @@ name: "industrial engineering" id: IndustrialEngineering description: A refresher course on modern engineering technology. - icon: Buildings/research.rsi/protolathe.png + icon: Constructible/Power/protolathe.rsi/protolathe.png requiredpoints: 1000 requiredtechnologies: - BasicResearch @@ -61,7 +61,7 @@ name: "electromagnetic theory" id: ElectromagneticTheory description: Try not to fry yourself. - icon: Buildings/apc.rsi/apcewires.png + icon: Constructible/Power/apc.rsi/apcewires.png requiredpoints: 1000 requiredtechnologies: - BasicResearch diff --git a/Resources/Prototypes/PDA/uplink_catalog.yml b/Resources/Prototypes/Catalog/Uplink/uplink_catalog.yml similarity index 100% rename from Resources/Prototypes/PDA/uplink_catalog.yml rename to Resources/Prototypes/Catalog/Uplink/uplink_catalog.yml diff --git a/Resources/Prototypes/VendingMachines/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/ammo.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/ammo.yml rename to Resources/Prototypes/Catalog/VendingMachines/ammo.yml diff --git a/Resources/Prototypes/VendingMachines/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/boozeomat.yml rename to Resources/Prototypes/Catalog/VendingMachines/boozeomat.yml diff --git a/Resources/Prototypes/VendingMachines/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/cart.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/cart.yml rename to Resources/Prototypes/Catalog/VendingMachines/cart.yml diff --git a/Resources/Prototypes/VendingMachines/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/chapel.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/chapel.yml rename to Resources/Prototypes/Catalog/VendingMachines/chapel.yml diff --git a/Resources/Prototypes/VendingMachines/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/cigs.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/cigs.yml rename to Resources/Prototypes/Catalog/VendingMachines/cigs.yml diff --git a/Resources/Prototypes/VendingMachines/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/coffee.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/coffee.yml rename to Resources/Prototypes/Catalog/VendingMachines/coffee.yml diff --git a/Resources/Prototypes/VendingMachines/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/cola.yml similarity index 99% rename from Resources/Prototypes/VendingMachines/cola.yml rename to Resources/Prototypes/Catalog/VendingMachines/cola.yml index ac7c298083..50990960ad 100644 --- a/Resources/Prototypes/VendingMachines/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/cola.yml @@ -13,3 +13,4 @@ DrinkSpaceUpCan: 10 DrinkStarkistCan: 10 DrinkThirteenLokoCan: 10 + diff --git a/Resources/Prototypes/VendingMachines/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/dinnerware.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/dinnerware.yml rename to Resources/Prototypes/Catalog/VendingMachines/dinnerware.yml diff --git a/Resources/Prototypes/VendingMachines/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/discount.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/discount.yml rename to Resources/Prototypes/Catalog/VendingMachines/discount.yml diff --git a/Resources/Prototypes/VendingMachines/empty.yml b/Resources/Prototypes/Catalog/VendingMachines/empty.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/empty.yml rename to Resources/Prototypes/Catalog/VendingMachines/empty.yml diff --git a/Resources/Prototypes/VendingMachines/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/engivend.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/engivend.yml rename to Resources/Prototypes/Catalog/VendingMachines/engivend.yml diff --git a/Resources/Prototypes/VendingMachines/hats.yml b/Resources/Prototypes/Catalog/VendingMachines/hats.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/hats.yml rename to Resources/Prototypes/Catalog/VendingMachines/hats.yml diff --git a/Resources/Prototypes/VendingMachines/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/magivend.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/magivend.yml rename to Resources/Prototypes/Catalog/VendingMachines/magivend.yml diff --git a/Resources/Prototypes/VendingMachines/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/medical.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/medical.yml rename to Resources/Prototypes/Catalog/VendingMachines/medical.yml diff --git a/Resources/Prototypes/VendingMachines/mining.yml b/Resources/Prototypes/Catalog/VendingMachines/mining.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/mining.yml rename to Resources/Prototypes/Catalog/VendingMachines/mining.yml diff --git a/Resources/Prototypes/VendingMachines/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/nutri.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/nutri.yml rename to Resources/Prototypes/Catalog/VendingMachines/nutri.yml diff --git a/Resources/Prototypes/VendingMachines/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/robotics.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/robotics.yml rename to Resources/Prototypes/Catalog/VendingMachines/robotics.yml diff --git a/Resources/Prototypes/VendingMachines/sale.yml b/Resources/Prototypes/Catalog/VendingMachines/sale.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/sale.yml rename to Resources/Prototypes/Catalog/VendingMachines/sale.yml diff --git a/Resources/Prototypes/VendingMachines/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/sec.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/sec.yml rename to Resources/Prototypes/Catalog/VendingMachines/sec.yml diff --git a/Resources/Prototypes/VendingMachines/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/seeds.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/seeds.yml rename to Resources/Prototypes/Catalog/VendingMachines/seeds.yml diff --git a/Resources/Prototypes/VendingMachines/shoes.yml b/Resources/Prototypes/Catalog/VendingMachines/shoes.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/shoes.yml rename to Resources/Prototypes/Catalog/VendingMachines/shoes.yml diff --git a/Resources/Prototypes/VendingMachines/smartfridge.yml b/Resources/Prototypes/Catalog/VendingMachines/smartfridge.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/smartfridge.yml rename to Resources/Prototypes/Catalog/VendingMachines/smartfridge.yml diff --git a/Resources/Prototypes/VendingMachines/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/snack.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/snack.yml rename to Resources/Prototypes/Catalog/VendingMachines/snack.yml diff --git a/Resources/Prototypes/VendingMachines/soviet.yml b/Resources/Prototypes/Catalog/VendingMachines/soviet.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/soviet.yml rename to Resources/Prototypes/Catalog/VendingMachines/soviet.yml diff --git a/Resources/Prototypes/VendingMachines/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/sovietsoda.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/sovietsoda.yml rename to Resources/Prototypes/Catalog/VendingMachines/sovietsoda.yml diff --git a/Resources/Prototypes/VendingMachines/suits.yml b/Resources/Prototypes/Catalog/VendingMachines/suits.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/suits.yml rename to Resources/Prototypes/Catalog/VendingMachines/suits.yml diff --git a/Resources/Prototypes/VendingMachines/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/theater.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/theater.yml rename to Resources/Prototypes/Catalog/VendingMachines/theater.yml diff --git a/Resources/Prototypes/VendingMachines/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/vendomat.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/vendomat.yml rename to Resources/Prototypes/Catalog/VendingMachines/vendomat.yml diff --git a/Resources/Prototypes/VendingMachines/vox.yml b/Resources/Prototypes/Catalog/VendingMachines/vox.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/vox.yml rename to Resources/Prototypes/Catalog/VendingMachines/vox.yml diff --git a/Resources/Prototypes/VendingMachines/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/wallmed.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/wallmed.yml rename to Resources/Prototypes/Catalog/VendingMachines/wallmed.yml diff --git a/Resources/Prototypes/VendingMachines/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/youtool.yml similarity index 100% rename from Resources/Prototypes/VendingMachines/youtool.yml rename to Resources/Prototypes/Catalog/VendingMachines/youtool.yml diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Construction/machines.yml index 8e6b9799f4..5e599c2b5a 100644 --- a/Resources/Prototypes/Construction/machines.yml +++ b/Resources/Prototypes/Construction/machines.yml @@ -7,7 +7,7 @@ placementmode: SnapgridBorder canbuildinimpassable: true icon: - sprite: Objects/Lighting/lighting.rsi + sprite: Constructible/Lighting/lighting.rsi state: on result: Poweredlight @@ -15,14 +15,14 @@ - material: Metal amount: 1 icon: - sprite: Objects/Lighting/lighting.rsi + sprite: Constructible/Lighting/lighting.rsi state: construct - material: Cable amount: 1 icon: - sprite: Objects/Lighting/lighting.rsi + sprite: Constructible/Lighting/lighting.rsi state: empty - material: Glass diff --git a/Resources/Prototypes/Construction/power.yml b/Resources/Prototypes/Construction/power.yml index 51d3733e81..8709d3e7d2 100644 --- a/Resources/Prototypes/Construction/power.yml +++ b/Resources/Prototypes/Construction/power.yml @@ -6,14 +6,14 @@ placementmode: SnapgridCenter description: A SMES is a large battery capable of connecting directly to a power grid. icon: - sprite: Buildings/smes.rsi + sprite: Constructible/Power/smes.rsi state: smes result: SMES steps: - material: Metal amount: 2 icon: - sprite: Buildings/smes.rsi + sprite: Constructible/Power/smes.rsi state: smes - material: Cable @@ -25,12 +25,12 @@ category: Machines/Power placementmode: SnapgridCenter description: A portable generator capable of producing power from thin air. - icon: Objects/Power/generator.png + icon: Constructible/Power/generator.png result: Generator steps: - material: Metal amount: 2 - icon: Objects/Power/generator.png + icon: Constructible/Power/generator.png - material: Cable amount: 2 @@ -43,14 +43,14 @@ description: Provides power from the grid wirelessly to other machines in the area. canbuildinimpassable: true icon: - sprite: Buildings/apc.rsi + sprite: Constructible/Power/apc.rsi state: apc0 result: APC steps: - material: Metal amount: 2 icon: - sprite: Buildings/apc.rsi + sprite: Constructible/Power/apc.rsi state: apcmaint - material: Cable diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index b529c544ec..3245fe7279 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/Resources/Prototypes/Construction/structures.yml @@ -4,7 +4,7 @@ category: Structures description: Keeps the air in and the greytide out. icon: - sprite: Buildings/Walls/solid.rsi + sprite: Constructible/Structures/Walls/solid.rsi state: full objecttype: Structure result: solid_wall @@ -12,7 +12,7 @@ steps: - material: Metal amount: 2 - icon: Buildings/wall_girder.png + icon: Constructible/Walls/wall_girder.png reverse: tool: Anchoring @@ -26,7 +26,7 @@ id: Table category: Structures icon: - sprite: Buildings/tables.rsi + sprite: Constructible/Structures/Tables/generic.rsi state: plain_preview result: Table placementmode: SnapgridCenter @@ -40,7 +40,7 @@ category: Structures description: Clear. icon: - sprite: Buildings/window.rsi + sprite: Constructible/Structures/Windows/window.rsi state: full objecttype: Structure result: Window @@ -57,7 +57,7 @@ category: Structures description: A low wall used for mounting windows. icon: - sprite: Buildings/low_wall.rsi + sprite: Constructible/Structures/Walls/low_wall.rsi state: metal objecttype: Structure result: LowWall @@ -65,7 +65,7 @@ steps: - material: Metal amount: 2 - icon: Buildings/wall_girder.png + icon: Constructible/Walls/wall_girder.png reverse: tool: Anchoring @@ -80,7 +80,7 @@ category: Structures description: Clear but tough. icon: - sprite: Buildings/rwindow.rsi + sprite: Constructible/Structures/Windows/reinforced_window.rsi state: full objecttype: Structure result: ReinforcedWindow diff --git a/Resources/Prototypes/Construction/weapons.yml b/Resources/Prototypes/Construction/weapons.yml index e5d9c78a5a..c984327c2a 100644 --- a/Resources/Prototypes/Construction/weapons.yml +++ b/Resources/Prototypes/Construction/weapons.yml @@ -4,7 +4,7 @@ category: Items/Weapons keywords: [melee] description: A crude spear for when you need to put holes in somebody. - icon: Objects/Melee/spear.rsi/spear.png + icon: Objects/Weapons/Melee/spear.rsi/spear.png result: Spear objecttype: Item steps: diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml index 9e149d472d..49811976d8 100644 --- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml @@ -8,7 +8,7 @@ - type: Sprite netsync: false drawdepth: Mobs # They're on the same layer as mobs, perspective. - sprite: Buildings/Doors/airlock_basic.rsi + sprite: Constructible/Structures/Doors/airlock_basic.rsi layers: - state: closed map: ["enum.DoorVisualLayers.Base"] @@ -21,7 +21,7 @@ - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Icon - sprite: Buildings/Doors/airlock_basic.rsi + sprite: Constructible/Structures/Doors/airlock_basic.rsi state: closed - type: Collidable shapes: @@ -39,9 +39,9 @@ - type: Appearance visuals: - type: AirlockVisualizer2D - open_sound: /Audio/machines/airlock_open.ogg - close_sound: /Audio/machines/airlock_close.ogg - deny_sound: /Audio/machines/airlock_deny.ogg + open_sound: /Audio/Machines/airlock_open.ogg + close_sound: /Audio/Machines/airlock_close.ogg + deny_sound: /Audio/Machines/airlock_deny.ogg - type: WiresVisualizer2D - type: PowerReceiver - type: Wires @@ -67,9 +67,9 @@ - type: Occluder enabled: false - type: Sprite - sprite: Buildings/Doors/airlock_glass.rsi + sprite: Constructible/Structures/Doors/airlock_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_glass.rsi + sprite: Constructible/Structures/Doors/airlock_glass.rsi - type: entity parent: Airlock @@ -77,6 +77,6 @@ name: maintenance hatch components: - type: Sprite - sprite: Buildings/Doors/airlock_maint.rsi + sprite: Constructible/Structures/Doors/airlock_maint.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint.rsi + sprite: Constructible/Structures/Doors/airlock_maint.rsi diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml index 06636d2d71..13ad8150a5 100644 --- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml +++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml @@ -5,15 +5,15 @@ suffix: External components: - type: Sprite - sprite: Buildings/Doors/airlock_external.rsi + sprite: Constructible/Structures/Doors/airlock_external.rsi - type: Icon - sprite: Buildings/Doors/airlock_external.rsi + sprite: Constructible/Structures/Doors/airlock_external.rsi - type: Appearance visuals: - type: AirlockVisualizer2D - open_sound: /Audio/machines/airlock_ext_open.ogg - close_sound: /Audio/machines/airlock_ext_close.ogg - deny_sound: /Audio/machines/airlock_deny.ogg + 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: entity @@ -22,9 +22,9 @@ suffix: Freezer components: - type: Sprite - sprite: Buildings/Doors/airlock_freezer.rsi + sprite: Constructible/Structures/Doors/airlock_freezer.rsi - type: Icon - sprite: Buildings/Doors/airlock_freezer.rsi + sprite: Constructible/Structures/Doors/airlock_freezer.rsi - type: entity parent: Airlock @@ -32,9 +32,9 @@ suffix: Engineering components: - type: Sprite - sprite: Buildings/Doors/airlock_engineering.rsi + sprite: Constructible/Structures/Doors/airlock_engineering.rsi - type: Icon - sprite: Buildings/Doors/airlock_engineering.rsi + sprite: Constructible/Structures/Doors/airlock_engineering.rsi - type: entity parent: Airlock @@ -42,9 +42,9 @@ suffix: Cargo components: - type: Sprite - sprite: Buildings/Doors/airlock_cargo.rsi + sprite: Constructible/Structures/Doors/airlock_cargo.rsi - type: Icon - sprite: Buildings/Doors/airlock_cargo.rsi + sprite: Constructible/Structures/Doors/airlock_cargo.rsi - type: entity parent: Airlock @@ -52,9 +52,9 @@ suffix: Medical components: - type: Sprite - sprite: Buildings/Doors/airlock_medical.rsi + sprite: Constructible/Structures/Doors/airlock_medical.rsi - type: Icon - sprite: Buildings/Doors/airlock_medical.rsi + sprite: Constructible/Structures/Doors/airlock_medical.rsi - type: entity parent: Airlock @@ -62,9 +62,9 @@ suffix: Science components: - type: Sprite - sprite: Buildings/Doors/airlock_science.rsi + sprite: Constructible/Structures/Doors/airlock_science.rsi - type: Icon - sprite: Buildings/Doors/airlock_science.rsi + sprite: Constructible/Structures/Doors/airlock_science.rsi - type: entity parent: Airlock @@ -72,9 +72,9 @@ suffix: Command components: - type: Sprite - sprite: Buildings/Doors/airlock_command.rsi + sprite: Constructible/Structures/Doors/airlock_command.rsi - type: Icon - sprite: Buildings/Doors/airlock_command.rsi + sprite: Constructible/Structures/Doors/airlock_command.rsi - type: entity parent: Airlock @@ -82,9 +82,9 @@ suffix: Security components: - type: Sprite - sprite: Buildings/Doors/airlock_security.rsi + sprite: Constructible/Structures/Doors/airlock_security.rsi - type: Icon - sprite: Buildings/Doors/airlock_security.rsi + sprite: Constructible/Structures/Doors/airlock_security.rsi # Glass Airlocks - type: entity @@ -93,9 +93,9 @@ suffix: Engineering components: - type: Sprite - sprite: Buildings/Doors/airlock_engineering_glass.rsi + sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_engineering_glass.rsi + sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi - type: entity parent: AirlockGlass @@ -103,9 +103,9 @@ suffix: Cargo components: - type: Sprite - sprite: Buildings/Doors/airlock_cargo_glass.rsi + sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_cargo_glass.rsi + sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi - type: entity parent: AirlockGlass @@ -113,9 +113,9 @@ suffix: Medical components: - type: Sprite - sprite: Buildings/Doors/airlock_medical_glass.rsi + sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_medical_glass.rsi + sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi - type: entity parent: AirlockGlass @@ -123,9 +123,9 @@ suffix: Science components: - type: Sprite - sprite: Buildings/Doors/airlock_science_glass.rsi + sprite: Constructible/Structures/Doors/airlock_science_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_science_glass.rsi + sprite: Constructible/Structures/Doors/airlock_science_glass.rsi - type: entity parent: AirlockGlass @@ -133,9 +133,9 @@ suffix: Command components: - type: Sprite - sprite: Buildings/Doors/airlock_command_glass.rsi + sprite: Constructible/Structures/Doors/airlock_command_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_command_glass.rsi + sprite: Constructible/Structures/Doors/airlock_command_glass.rsi - type: entity parent: AirlockGlass @@ -143,9 +143,9 @@ suffix: Security components: - type: Sprite - sprite: Buildings/Doors/airlock_security_glass.rsi + sprite: Constructible/Structures/Doors/airlock_security_glass.rsi - type: Icon - sprite: Buildings/Doors/airlock_security_glass.rsi + sprite: Constructible/Structures/Doors/airlock_security_glass.rsi # Maintenance Hatchs - type: entity @@ -154,9 +154,9 @@ suffix: Cargo components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_cargo.rsi + sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_cargo.rsi + sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi - type: entity parent: AirlockMaint @@ -164,9 +164,9 @@ suffix: Command components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_command.rsi + sprite: Constructible/Structures/Doors/airlock_maint_command.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_command.rsi + sprite: Constructible/Structures/Doors/airlock_maint_command.rsi - type: entity parent: AirlockMaint @@ -174,9 +174,9 @@ suffix: Common components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_common.rsi + sprite: Constructible/Structures/Doors/airlock_maint_common.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_common.rsi + sprite: Constructible/Structures/Doors/airlock_maint_common.rsi - type: entity parent: AirlockMaint @@ -184,9 +184,9 @@ suffix: Engineering components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_engi.rsi + sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_engi.rsi + sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi - type: entity parent: AirlockMaint @@ -194,9 +194,9 @@ suffix: Interior components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_int.rsi + sprite: Constructible/Structures/Doors/airlock_maint_int.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_int.rsi + sprite: Constructible/Structures/Doors/airlock_maint_int.rsi - type: entity parent: AirlockMaint @@ -204,9 +204,9 @@ suffix: Medical components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_med.rsi + sprite: Constructible/Structures/Doors/airlock_maint_med.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_med.rsi + sprite: Constructible/Structures/Doors/airlock_maint_med.rsi - type: entity parent: AirlockMaint @@ -214,9 +214,9 @@ suffix: RnD components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_rnd.rsi + sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_rnd.rsi + sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi - type: entity parent: AirlockMaint @@ -224,6 +224,6 @@ suffix: Security components: - type: Sprite - sprite: Buildings/Doors/airlock_maint_sec.rsi + sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi - type: Icon - sprite: Buildings/Doors/airlock_maint_sec.rsi + sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml index 84980e5f0d..38e957b6bd 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml @@ -7,7 +7,7 @@ - type: SecureEntityStorage - type: Sprite netsync: false - sprite: Buildings/closet.rsi + sprite: Constructible/Structures/closet.rsi layers: - state: generic - state: generic_door diff --git a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml index 55a315154b..b68bef3f82 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml @@ -5,9 +5,9 @@ description: A storage tank containing welding fuel. components: - type: Sprite - texture: Buildings/weldtank.png + texture: Constructible/Misc/weldtank.png - type: Icon - texture: Buildings/weldtank.png + texture: Constructible/Misc/weldtank.png - type: Explosive devastationRange: 1 heavyImpactRange: 2 diff --git a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml index b63944885b..d6e5e7a91c 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml @@ -6,9 +6,9 @@ description: "A water tank. It is used to store high amounts of water." components: - type: Sprite - texture: Buildings/watertank.png + texture: Constructible/Misc/watertank.png - type: Icon - texture: Buildings/watertank.png + texture: Constructible/Misc/watertank.png - type: entity parent: WaterTank diff --git a/Resources/Prototypes/Entities/Buildings/Storage/closet.yml b/Resources/Prototypes/Entities/Buildings/Storage/closet.yml index a11dcb00e3..d5e6505817 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/closet.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/closet.yml @@ -5,7 +5,7 @@ components: - type: Sprite netsync: false - sprite: Buildings/closet.rsi + sprite: Constructible/Structures/closet.rsi layers: - state: generic - state: generic_door @@ -14,7 +14,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Buildings/closet.rsi + sprite: Constructible/Structures/closet.rsi state: generic_door - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml index 49356ce829..cdf6ab7c9c 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml @@ -5,13 +5,13 @@ components: - type: Sprite netsync: false - sprite: Buildings/crate.rsi + sprite: Constructible/Structures/Crates/generic.rsi layers: - state: crate - state: crate_door map: ["enum.StorageVisualLayers.Door"] - type: Icon - sprite: Buildings/crate.rsi + sprite: Constructible/Structures/Crates/generic.rsi state: crate - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml index 03ad54ccad..c3bae9afb7 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml @@ -1,9 +1,10 @@ - type: entity id: CratePlastic - name: plastic crate parent: CrateGeneric + name: plastic crate components: - type: Sprite + sprite: Constructible/Structures/Crates/plastic.rsi layers: - state: plasticcrate - state: plasticcrate_door @@ -14,14 +15,16 @@ state_open: plasticcrate_open state_closed: plasticcrate_door - type: Icon + sprite: Constructible/Structures/Crates/plastic.rsi state: plasticcrate - type: entity id: CrateFreezer - name: freezer parent: CrateGeneric + name: freezer components: - type: Sprite + sprite: Constructible/Structures/Crates/freezer.rsi layers: - state: freezer - state: freezer_door @@ -32,14 +35,16 @@ state_open: freezer_open state_closed: freezer_door - type: Icon + sprite: Constructible/Structures/Crates/freezer.rsi state: freezer - type: entity id: CrateHydroponics - name: hydroponics crate parent: CrateGeneric + name: hydroponics crate components: - type: Sprite + sprite: Constructible/Structures/Crates/hydro.rsi layers: - state: hydrocrate - state: hydrocrate_door @@ -50,14 +55,16 @@ state_open: hydrocrate_open state_closed: hydrocrate_door - type: Icon + sprite: Constructible/Structures/Crates/hydro.rsi state: hydrocrate - type: entity id: CrateMedical - name: medical crate parent: CrateGeneric + name: medical crate components: - type: Sprite + sprite: Constructible/Structures/Crates/medical.rsi layers: - state: medicalcrate - state: medicalcrate_door @@ -68,15 +75,17 @@ state_open: medicalcrate_open state_closed: medicalcrate_door - type: Icon + sprite: Constructible/Structures/Crates/medical.rsi state: medicalcrate - type: entity id: CrateRadiation name: radiation gear crate - description: Is not actually lead lined. Do not store your plutonium in this. parent: CrateGeneric + description: Is not actually lead lined. Do not store your plutonium in this. components: - type: Sprite + sprite: Constructible/Structures/Crates/radiation.rsi layers: - state: radiationcrate - state: radiationcrate_door @@ -87,14 +96,16 @@ state_open: radiationcrate_open state_closed: radiationcrate_door - type: Icon + sprite: Constructible/Structures/Crates/radiation.rsi state: radiationcrate - type: entity id: CrateInternals - name: internals crate parent: CrateGeneric + name: internals crate components: - type: Sprite + sprite: Constructible/Structures/Crates/o2.rsi layers: - state: o2crate - state: o2crate_door @@ -105,12 +116,13 @@ state_open: o2crate_open state_closed: o2crate_door - type: Icon + sprite: Constructible/Structures/Crates/o2.rsi state: o2crate - type: entity id: CrateFlashlights - name: flashlight crate (x5) parent: CrateGeneric + name: flashlight crate (x5) components: - type: StorageFill contents: @@ -122,8 +134,8 @@ - type: entity id: CrateLightBulb - name: light bulb crate (x10) parent: CrateGeneric + name: light bulb crate (x10) components: - type: StorageFill contents: @@ -140,8 +152,8 @@ - type: entity id: CrateFireExtinguisher - name: fire extinguisher crate (x3) parent: CrateGeneric + name: fire extinguisher crate (x3) components: - type: StorageFill contents: @@ -151,8 +163,8 @@ - type: entity id: CratePen - name: pen crate (x10) parent: CrateGeneric + name: pen crate (x10) components: - type: StorageFill contents: @@ -169,8 +181,8 @@ - type: entity id: CrateBikeHorn - name: bike horn crate (x5) parent: CrateGeneric + name: bike horn crate (x5) components: - type: StorageFill contents: @@ -182,8 +194,8 @@ - type: entity id: CrateCleaver - name: cleaver crate (x5) parent: CrateGeneric + name: cleaver crate (x5) components: - type: StorageFill contents: @@ -195,8 +207,8 @@ - type: entity id: CrateFuelTank - name: fuel tank parent: CrateGeneric + name: fuel tank components: - type: StorageFill contents: @@ -204,8 +216,8 @@ - type: entity id: CrateMedicalScanner - name: medical scanner parent: CrateGeneric + name: medical scanner components: - type: StorageFill contents: @@ -213,8 +225,8 @@ - type: entity id: CrateGlass - name: glass sheet crate (x50) parent: CrateGeneric + name: glass sheet crate (x50) components: - type: StorageFill contents: @@ -222,8 +234,8 @@ - type: entity id: CrateCable - name: cable coil crate (x50) parent: CrateGeneric + name: cable coil crate (x50) components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Buildings/asteroid.yml b/Resources/Prototypes/Entities/Buildings/asteroid.yml index a1edeb307d..a621d1b896 100644 --- a/Resources/Prototypes/Entities/Buildings/asteroid.yml +++ b/Resources/Prototypes/Entities/Buildings/asteroid.yml @@ -6,10 +6,10 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Buildings/Walls/asteroid_rock.rsi + sprite: Constructible/Structures/Walls/asteroid_rock.rsi state: 0 - type: Icon - sprite: Buildings/Walls/asteroid_rock.rsi + sprite: Constructible/Structures/Walls/asteroid_rock.rsi state: 0 - type: Collidable shapes: diff --git a/Resources/Prototypes/Entities/Buildings/bar_sign.yml b/Resources/Prototypes/Entities/Buildings/bar_sign.yml index 03deb0a788..0c3aeb82aa 100644 --- a/Resources/Prototypes/Entities/Buildings/bar_sign.yml +++ b/Resources/Prototypes/Entities/Buildings/bar_sign.yml @@ -7,10 +7,10 @@ - type: Collidable - type: Sprite drawdepth: WallTops - sprite: Buildings/barsign.rsi + sprite: Constructible/Misc/barsign.rsi state: empty - type: Icon - sprite: Buildings/barsign.rsi + sprite: Constructible/Misc/barsign.rsi state: empty - type: PowerReceiver - type: BarSign diff --git a/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml b/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml index e090da8187..a44e1d54dc 100644 --- a/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml @@ -5,9 +5,9 @@ parent: ReagentDispenserBase components: - type: Sprite - texture: Buildings/chemicals.rsi/booze_dispenser.png + texture: Constructible/Power/dispensers.rsi/booze_dispenser.png - type: Icon - texture: Buildings/chemicals.rsi/booze_dispenser.png + texture: Constructible/Power/dispensers.rsi/booze_dispenser.png - type: ReagentDispenser pack: BoozeDispenserInventory diff --git a/Resources/Prototypes/Entities/Buildings/catwalk.yml b/Resources/Prototypes/Entities/Buildings/catwalk.yml index 12a9c453f9..34bf08f1ad 100644 --- a/Resources/Prototypes/Entities/Buildings/catwalk.yml +++ b/Resources/Prototypes/Entities/Buildings/catwalk.yml @@ -7,10 +7,10 @@ - type: Collidable - type: Sprite netsync: false - sprite: Buildings/catwalk.rsi + sprite: Constructible/Tiles/catwalk.rsi drawdepth: FloorTiles - type: Icon - sprite: Buildings/catwalk.rsi + sprite: Constructible/Tiles/catwalk.rsi state: catwalk_preview - type: SnapGrid offset: Center diff --git a/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml b/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml index 12c6069284..6b5c0ad870 100644 --- a/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml @@ -5,9 +5,9 @@ description: An industrial grade chemical dispenser with a sizeable chemical supply. components: - type: Sprite - texture: Buildings/chemicals.rsi/industrial_dispenser.png + texture: Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png - type: Icon - texture: Buildings/chemicals.rsi/industrial_dispenser.png + texture: Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png - type: ReagentDispenser pack: ChemDispenserStandardInventory - type: PowerReceiver diff --git a/Resources/Prototypes/Entities/Buildings/computers.yml b/Resources/Prototypes/Entities/Buildings/computers.yml index ff9e07e828..a47bb963eb 100644 --- a/Resources/Prototypes/Entities/Buildings/computers.yml +++ b/Resources/Prototypes/Entities/Buildings/computers.yml @@ -23,14 +23,14 @@ - MobImpassable - VaultImpassable - type: Icon - sprite: Buildings/computer.rsi + sprite: Constructible/Power/computers.rsi state: computer - type: Computer - type: PowerReceiver - type: Anchorable - type: Sprite - sprite: Buildings/computer.rsi + sprite: Constructible/Power/computers.rsi layers: - state: computer map: ["enum.ComputerVisualizer2D+Layers.Body"] diff --git a/Resources/Prototypes/Entities/Buildings/furniture.yml b/Resources/Prototypes/Entities/Buildings/furniture.yml index 80619b957c..282f4c0096 100644 --- a/Resources/Prototypes/Entities/Buildings/furniture.yml +++ b/Resources/Prototypes/Entities/Buildings/furniture.yml @@ -6,11 +6,11 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: stool_base color: "#8e9799" - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: stool_base - type: Strap position: Stand @@ -35,10 +35,10 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: officechair_white - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: officechair_white - type: Strap position: Stand @@ -52,10 +52,10 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: officechair_dark - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: officechair_dark - type: Strap position: Stand @@ -68,11 +68,11 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: chair color: "#8e9799" - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: chair - type: Strap position: Stand @@ -96,10 +96,10 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: bed - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: bed - type: Strap position: Down diff --git a/Resources/Prototypes/Entities/Buildings/girder.yml b/Resources/Prototypes/Entities/Buildings/girder.yml index 390f708a62..d4dedfc92d 100644 --- a/Resources/Prototypes/Entities/Buildings/girder.yml +++ b/Resources/Prototypes/Entities/Buildings/girder.yml @@ -5,9 +5,9 @@ - type: Clickable - type: InteractionOutline - type: Sprite - texture: Buildings/wall_girder.png + texture: Constructible/Structures/Walls/wall_girder.png - type: Icon - texture: Buildings/wall_girder.png + texture: Constructible/Structures/Walls/wall_girder.png - type: Collidable shapes: diff --git a/Resources/Prototypes/Entities/Buildings/gravity_generator.yml b/Resources/Prototypes/Entities/Buildings/gravity_generator.yml index d499d4b915..7213d9bfb7 100644 --- a/Resources/Prototypes/Entities/Buildings/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Buildings/gravity_generator.yml @@ -4,14 +4,14 @@ description: It's what keeps you to the floor. components: - type: Sprite - sprite: Buildings/gravity_generator.rsi + sprite: Constructible/Power/gravity_generator.rsi layers: - state: on - - sprite: Buildings/gravity_generator_core.rsi + - sprite: Constructible/Power/gravity_generator_core.rsi state: activated shader: unshaded - type: Icon - sprite: Buildings/gravity_generator.rsi + sprite: Constructible/Power/gravity_generator.rsi state: on - type: SnapGrid offset: Center diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml index 05deaefd08..7d4954ea06 100644 --- a/Resources/Prototypes/Entities/Buildings/instruments.yml +++ b/Resources/Prototypes/Entities/Buildings/instruments.yml @@ -35,10 +35,10 @@ - type: Instrument program: 1 - type: Sprite - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: piano - type: Icon - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: piano - type: Anchorable - type: Collidable @@ -57,10 +57,10 @@ - type: Instrument program: 81 - type: Sprite - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: minimoog - type: Icon - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: minimoog - type: entity @@ -72,10 +72,10 @@ - type: Instrument program: 20 - type: Sprite - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: church_organ - type: Icon - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: church_organ - type: entity @@ -86,8 +86,8 @@ - type: Instrument program: 13 - type: Sprite - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: xylophone - type: Icon - sprite: Objects/Instruments/otherinstruments.rsi + sprite: Objects/Fun/Instruments/otherinstruments.rsi state: xylophone diff --git a/Resources/Prototypes/Entities/Buildings/lathe.yml b/Resources/Prototypes/Entities/Buildings/lathe.yml index 26c65e0db9..13a1af204d 100644 --- a/Resources/Prototypes/Entities/Buildings/lathe.yml +++ b/Resources/Prototypes/Entities/Buildings/lathe.yml @@ -35,7 +35,7 @@ name: "autolathe" components: - type: Sprite - sprite: Buildings/autolathe.rsi + sprite: Constructible/Power/autolathe.rsi layers: - state: autolathe map: ["enum.AutolatheVisualLayers.Base"] @@ -43,7 +43,7 @@ shader: unshaded map: ["enum.AutolatheVisualLayers.BaseUnlit"] - type: Icon - sprite: Buildings/autolathe.rsi + sprite: Constructible/Power/autolathe.rsi state: autolathe - type: Collidable shapes: @@ -82,7 +82,7 @@ name: "protolathe" components: - type: Sprite - sprite: Buildings/research.rsi + sprite: Constructible/Power/protolathe.rsi layers: - state: protolathe map: ["enum.ProtolatheVisualLayers.Base"] @@ -92,7 +92,7 @@ - state: protolathe map: ["enum.ProtolatheVisualLayers.AnimationLayer"] - type: Icon - sprite: Buildings/research.rsi + sprite: Constructible/Power/protolathe.rsi state: protolathe - type: Collidable shapes: diff --git a/Resources/Prototypes/Entities/Buildings/lighting.yml b/Resources/Prototypes/Entities/Buildings/lighting.yml index 0e831a6628..6067f47b90 100644 --- a/Resources/Prototypes/Entities/Buildings/lighting.yml +++ b/Resources/Prototypes/Entities/Buildings/lighting.yml @@ -12,10 +12,10 @@ - type: Collidable - type: LoopingSound - type: Sprite - sprite: Buildings/light_tube.rsi + sprite: Constructible/Lighting/light_tube.rsi state: on - type: Icon - sprite: Buildings/light_tube.rsi + sprite: Constructible/Lighting/light_tube.rsi state: on - type: PointLight radius: 8 @@ -35,10 +35,10 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Buildings/light_tube.rsi + sprite: Constructible/Lighting/light_tube.rsi state: off - type: Icon - sprite: Buildings/light_tube.rsi + sprite: Constructible/Lighting/light_tube.rsi state: off - type: PointLight enabled: false @@ -54,10 +54,10 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Buildings/light_small.rsi + sprite: Constructible/Lighting/light_small.rsi state: off - type: Icon - sprite: Buildings/light_small.rsi + sprite: Constructible/Lighting/light_small.rsi state: off - type: PointLight energy: 1.0 diff --git a/Resources/Prototypes/Entities/Buildings/low_wall.yml b/Resources/Prototypes/Entities/Buildings/low_wall.yml index b578c64004..3fc92263b9 100644 --- a/Resources/Prototypes/Entities/Buildings/low_wall.yml +++ b/Resources/Prototypes/Entities/Buildings/low_wall.yml @@ -13,10 +13,10 @@ netsync: false color: "#889192" drawdepth: Walls - sprite: Buildings/low_wall.rsi + sprite: Constructible/Structures/Walls/low_wall.rsi - type: Icon - sprite: Buildings/low_wall.rsi + sprite: Constructible/Structures/Walls/low_wall.rsi state: metal - type: Collidable @@ -42,4 +42,4 @@ - type: Sprite color: "#889192" drawdepth: WallMountedItems - sprite: Buildings/low_wall.rsi + sprite: Constructible/Structures/Walls/low_wall.rsi diff --git a/Resources/Prototypes/Entities/Buildings/medical_scanner.yml b/Resources/Prototypes/Entities/Buildings/medical_scanner.yml index ff6e0c01f4..35a4ae7f3b 100644 --- a/Resources/Prototypes/Entities/Buildings/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Buildings/medical_scanner.yml @@ -5,7 +5,7 @@ components: - type: Sprite netsync: false - sprite: Buildings/medical_scanner.rsi + sprite: Constructible/Power/medical_scanner.rsi layers: - state: scanner_open map: ["enum.MedicalScannerVisualLayers.Machine"] @@ -13,7 +13,7 @@ map: ["enum.MedicalScannerVisualLayers.Terminal"] - type: PowerReceiver - type: Icon - sprite: Buildings/medical_scanner.rsi + sprite: Constructible/Power/medical_scanner.rsi state: scanner_open - type: Anchorable - type: Clickable diff --git a/Resources/Prototypes/Entities/Buildings/mirror.yml b/Resources/Prototypes/Entities/Buildings/mirror.yml index 5e2f79cce8..1f11cc2a73 100644 --- a/Resources/Prototypes/Entities/Buildings/mirror.yml +++ b/Resources/Prototypes/Entities/Buildings/mirror.yml @@ -3,10 +3,10 @@ name: mirror components: - type: Sprite - sprite: Buildings/mirror.rsi + sprite: Constructible/Misc/mirror.rsi state: mirror - type: Icon - sprite: Buildings/mirror.rsi + sprite: Constructible/Misc/mirror.rsi state: mirror - type: Collidable shapes: diff --git a/Resources/Prototypes/Entities/Buildings/power.yml b/Resources/Prototypes/Entities/Buildings/power.yml index f13f210960..33d6697e62 100644 --- a/Resources/Prototypes/Entities/Buildings/power.yml +++ b/Resources/Prototypes/Entities/Buildings/power.yml @@ -10,7 +10,7 @@ - type: SnapGrid offset: Center - type: Icon - texture: Objects/Power/eightdirwire.png + texture: Constructible/Power/eightdirwire.png - type: Sprite drawdepth: BelowFloor - type: IconSmooth @@ -25,7 +25,7 @@ name: HV Wire components: - type: Sprite - sprite: Objects/Power/hv_cable.rsi + sprite: Constructible/Power/hv_cable.rsi state: hvcable_0 - type: IconSmooth base: hvcable_ @@ -45,7 +45,7 @@ components: - type: Sprite color: Yellow - sprite: Objects/Power/mv_cable.rsi + sprite: Constructible/Power/mv_cable.rsi state: mvcable_0 - type: IconSmooth base: mvcable_ @@ -65,7 +65,7 @@ components: - type: Sprite color: Green - sprite: Objects/Power/lv_cable.rsi + sprite: Constructible/Power/lv_cable.rsi state: lvcable_0 - type: IconSmooth base: lvcable_ @@ -96,9 +96,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects/Power/generator.png + texture: Constructible/Power/generator.png - type: Icon - texture: Objects/Power/generator.png + texture: Constructible/Power/generator.png - type: NodeContainer nodeTypes: { HVPower : ["AdjacentNode"] } - type: PowerSupplier @@ -123,9 +123,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects/Power/wiredmachine.png + texture: Constructible/Power/wiredmachine.png - type: Icon - texture: Objects/Power/wiredmachine.png + texture: Constructible/Power/wiredmachine.png - type: NodeContainer nodeTypes: { HVPower : ["AdjacentNode"] } - type: PowerConsumer @@ -153,9 +153,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects/Power/provider.png + texture: Constructible/Power/provider.png - type: Icon - texture: Objects/Power/provider.png + texture: Constructible/Power/provider.png - type: Battery - type: NodeContainer nodeTypes: { HVPower : ["AdjacentNode"] } @@ -181,9 +181,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects/Power/provider.png + texture: Constructible/Power/provider.png - type: Icon - texture: Objects/Power/provider.png + texture: Constructible/Power/provider.png - type: Battery - type: NodeContainer nodeTypes: { HVPower : ["AdjacentNode"] } @@ -210,13 +210,13 @@ offset: Center - type: Sprite netsync: false - sprite: Buildings/smes.rsi + sprite: Constructible/Power/smes.rsi state: smes layers: - state: smes-display shader: unshaded - type: Icon - sprite: Buildings/smes.rsi + sprite: Constructible/Power/smes.rsi state: smes - type: Smes - type: Appearance @@ -253,9 +253,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects\Power\storage.png + texture: Constructible/Power/storage.png - type: Icon - texture: Objects\Power\storage.png + texture: Constructible/Power/storage.png state: smes - type: Battery maxCharge: 1000 @@ -291,10 +291,10 @@ drawdepth: WallMountedItems netsync: false texture: "" - sprite: "Buildings/apc.rsi" + sprite: "Constructible/Power/apc.rsi" state: apc0 - type: Icon - texture: Buildings/apc.rsi/apc0.png + texture: Constructible/Power/apc.rsi/apc0.png - type: Appearance visuals: - type: ApcVisualizer2D @@ -332,9 +332,9 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Objects/Furniture/wirelessmachine.png + texture: Constructible/Power/wirelessmachine.png - type: Icon - texture: Objects/Furniture/wirelessmachine.png + texture: Constructible/Power/wirelessmachine.png - type: PowerReceiver - type: Physics Anchored: true @@ -354,10 +354,10 @@ - !type:PhysShapeAabb layer: [MobMask, Opaque] - type: Sprite - sprite: Buildings/solar_panel.rsi + sprite: Constructible/Power/solar_panel.rsi state: normal - type: Icon - sprite: Buildings/solar_panel.rsi + sprite: Constructible/Power/solar_panel.rsi state: normal - type: NodeContainer nodeTypes: { HVPower : ["AdjacentNode"] } diff --git a/Resources/Prototypes/Entities/Buildings/shuttle.yml b/Resources/Prototypes/Entities/Buildings/shuttle.yml index 6c21d6720b..c2e9156058 100644 --- a/Resources/Prototypes/Entities/Buildings/shuttle.yml +++ b/Resources/Prototypes/Entities/Buildings/shuttle.yml @@ -4,11 +4,11 @@ id: PilotSeatChair components: - type: Sprite - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: chair color: "#8e9799" - type: Icon - sprite: Buildings/furniture.rsi + sprite: Constructible/Misc/furniture.rsi state: chair - type: Collidable - type: Clickable diff --git a/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml b/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml index b5ecbf1b52..850ad2971f 100644 --- a/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml @@ -5,9 +5,9 @@ description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. components: - type: Sprite - texture: Buildings/chemicals.rsi/soda_dispenser.png + texture: Constructible/Power/dispensers.rsi/soda_dispenser.png - type: Icon - texture: Buildings/chemicals.rsi/soda_dispenser.png + texture: Constructible/Power/dispensers.rsi/soda_dispenser.png - type: ReagentDispenser pack: SodaDispenserInventory diff --git a/Resources/Prototypes/Entities/Buildings/table.yml b/Resources/Prototypes/Entities/Buildings/table.yml index 8582324e67..3a3b781e98 100644 --- a/Resources/Prototypes/Entities/Buildings/table.yml +++ b/Resources/Prototypes/Entities/Buildings/table.yml @@ -7,26 +7,21 @@ - type: PlaceableSurface - type: Sprite netsync: false - sprite: Buildings/tables.rsi - + sprite: Constructible/Structures/Tables/generic.rsi - type: Icon - sprite: Buildings/tables.rsi + sprite: Constructible/Structures/Tables/generic.rsi state: plain_preview - - type: Collidable shapes: - !type:PhysShapeAabb layer: - SmallImpassable - MobImpassable - - type: SnapGrid offset: Center - - type: IconSmooth - key: tables + key: generic base: solid_ - - type: Damageable - type: Destructible thresholdvalue: 50 @@ -38,9 +33,11 @@ parent: Table name: "wood table" components: + - type: Sprite + sprite: Constructible/Structures/Tables/wood.rsi - type: IconSmooth + key: wood base: wood_ - - type: Damageable - type: Destructible thresholdvalue: 50 diff --git a/Resources/Prototypes/Entities/Buildings/turret.yml b/Resources/Prototypes/Entities/Buildings/turret.yml index a778418bfa..0fc0da08e6 100644 --- a/Resources/Prototypes/Entities/Buildings/turret.yml +++ b/Resources/Prototypes/Entities/Buildings/turret.yml @@ -6,7 +6,7 @@ - type: InteractionOutline - type: Collidable - type: Sprite - texture: Buildings/TurrBase.png + texture: Constructible/Misc/TurrBase.png - type: entity id: TurretTopGun @@ -17,7 +17,7 @@ - type: Collidable - type: Sprite drawdepth: WallMountedItems - texture: Buildings/TurrTop.png + texture: Constructible/Misc/TurrTop.png directional: false - type: entity @@ -29,7 +29,7 @@ - type: Collidable - type: Sprite drawdepth: WallMountedItems - texture: Buildings/TurrLamp.png + texture: Constructible/Misc/TurrLamp.png directional: false - type: PointLight radius: 512 diff --git a/Resources/Prototypes/Entities/Buildings/vending_machines.yml b/Resources/Prototypes/Entities/Buildings/vending_machines.yml index 6d02866ef7..5e5bcb502d 100644 --- a/Resources/Prototypes/Entities/Buildings/vending_machines.yml +++ b/Resources/Prototypes/Entities/Buildings/vending_machines.yml @@ -7,14 +7,14 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Buildings/VendingMachines/empty.rsi + sprite: Constructible/Power/VendingMachines/empty.rsi layers: - state: normal map: ["enum.VendingMachineVisualLayers.Base"] - - texture: Buildings/maintenance_panel.png + - texture: Constructible/Power/VendingMachines/maintenance_panel.png map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Icon - sprite: Buildings/VendingMachines/empty.rsi + sprite: Constructible/Power/VendingMachines/empty.rsi state: normal - type: Collidable shapes: @@ -59,7 +59,9 @@ - type: VendingMachine pack: AmmoVend - type: Icon - sprite: Buildings/VendingMachines/ammo.rsi + sprite: Constructible/Power/VendingMachines/ammo.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/ammo.rsi - type: entity parent: VendingMachine @@ -69,7 +71,9 @@ - type: VendingMachine pack: Booze-O-Mat - type: Icon - sprite: Buildings/VendingMachines/boozeomat.rsi + sprite: Constructible/Power/VendingMachines/boozeomat.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/boozeomat.rsi - type: entity parent: VendingMachine @@ -79,7 +83,9 @@ - type: VendingMachine pack: PTech - type: Icon - sprite: Buildings/VendingMachines/cart.rsi + sprite: Constructible/Power/VendingMachines/cart.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/cart.rsi - type: entity parent: VendingMachine @@ -89,7 +95,9 @@ - type: VendingMachine pack: PietyVend - type: Icon - sprite: Buildings/VendingMachines/chapel.rsi + sprite: Constructible/Power/VendingMachines/chapel.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/chapel.rsi - type: entity parent: VendingMachine @@ -99,7 +107,9 @@ - type: VendingMachine pack: Cigarette machine - type: Icon - sprite: Buildings/VendingMachines/cigs.rsi + sprite: Constructible/Power/VendingMachines/cigs.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/cigs.rsi - type: entity parent: VendingMachine @@ -109,9 +119,9 @@ - type: VendingMachine pack: Hot Drinks machine - type: Icon - sprite: Buildings/VendingMachines/coffee.rsi + sprite: Constructible/Power/VendingMachines/coffee.rsi - type: Sprite - sprite: Buildings/VendingMachines/coffee.rsi + sprite: Constructible/Power/VendingMachines/coffee.rsi layers: - state: normal map: ["enum.VendingMachineVisualLayers.Base"] @@ -129,7 +139,9 @@ - type: VendingMachine pack: Robust Softdrinks - type: Icon - sprite: Buildings/VendingMachines/cola.rsi + sprite: Constructible/Power/VendingMachines/cola.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/cola.rsi - type: entity parent: VendingMachine @@ -139,7 +151,9 @@ - type: VendingMachine pack: Dinnerware - type: Icon - sprite: Buildings/VendingMachines/dinnerware.rsi + sprite: Constructible/Power/VendingMachines/dinnerware.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/dinnerware.rsi - type: entity parent: VendingMachine @@ -149,7 +163,9 @@ - type: VendingMachine pack: Discount Dan's - type: Icon - sprite: Buildings/VendingMachines/discount.rsi + sprite: Constructible/Power/VendingMachines/discount.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/discount.rsi - type: entity parent: VendingMachine @@ -159,7 +175,9 @@ - type: VendingMachine pack: Engi-Vend - type: Icon - sprite: Buildings/VendingMachines/engivend.rsi + sprite: Constructible/Power/VendingMachines/engivend.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/engivend.rsi - type: entity parent: VendingMachine @@ -169,7 +187,9 @@ - type: VendingMachine pack: Hatlord 9000 - type: Icon - sprite: Buildings/VendingMachines/hats.rsi + sprite: Constructible/Power/VendingMachines/hats.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/hats.rsi - type: entity parent: VendingMachine @@ -179,7 +199,9 @@ - type: VendingMachine pack: MagiVend - type: Icon - sprite: Buildings/VendingMachines/magivend.rsi + sprite: Constructible/Power/VendingMachines/magivend.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/magivend.rsi - type: entity parent: VendingMachine @@ -189,7 +211,9 @@ - type: VendingMachine pack: NanoMed Plus - type: Icon - sprite: Buildings/VendingMachines/medical.rsi + sprite: Constructible/Power/VendingMachines/medical.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/medical.rsi - type: entity parent: VendingMachine @@ -199,7 +223,9 @@ - type: VendingMachine pack: Dwarven Mining Equipment - type: Icon - sprite: Buildings/VendingMachines/mining.rsi + sprite: Constructible/Power/VendingMachines/mining.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/mining.rsi - type: entity parent: VendingMachine @@ -209,7 +235,9 @@ - type: VendingMachine pack: NutriMax - type: Icon - sprite: Buildings/VendingMachines/nutri.rsi + sprite: Constructible/Power/VendingMachines/nutri.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/nutri.rsi - type: entity parent: VendingMachine @@ -219,7 +247,9 @@ - type: VendingMachine pack: Robotech Deluxe - type: Icon - sprite: Buildings/VendingMachines/robotics.rsi + sprite: Constructible/Power/VendingMachines/robotics.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/robotics.rsi - type: entity parent: VendingMachine @@ -229,7 +259,9 @@ - type: VendingMachine pack: Sales - type: Icon - sprite: Buildings/VendingMachines/sale.rsi + sprite: Constructible/Power/VendingMachines/sale.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/sale.rsi - type: entity parent: VendingMachine @@ -239,7 +271,9 @@ - type: VendingMachine pack: SecTech - type: Icon - sprite: Buildings/VendingMachines/sec.rsi + sprite: Constructible/Power/VendingMachines/sec.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/sec.rsi - type: entity parent: VendingMachine @@ -249,7 +283,9 @@ - type: VendingMachine pack: MegaSeed Servitor - type: Icon - sprite: Buildings/VendingMachines/seeds.rsi + sprite: Constructible/Power/VendingMachines/seeds.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/seeds.rsi - type: entity parent: VendingMachine @@ -259,7 +295,9 @@ - type: VendingMachine pack: Shoelord 9000 - type: Icon - sprite: Buildings/VendingMachines/shoes.rsi + sprite: Constructible/Power/VendingMachines/shoes.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/shoes.rsi - type: entity parent: VendingMachine @@ -269,7 +307,9 @@ - type: VendingMachine pack: SmartFridge - type: Icon - sprite: Buildings/VendingMachines/smartfridge.rsi + sprite: Constructible/Power/VendingMachines/smartfridge.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/smartfridge.rsi - type: entity parent: VendingMachine @@ -279,7 +319,9 @@ - type: VendingMachine pack: Getmore Chocolate Corp - type: Icon - sprite: Buildings/VendingMachines/snack.rsi + sprite: Constructible/Power/VendingMachines/snack.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/snack.rsi - type: entity parent: VendingMachine @@ -289,7 +331,9 @@ - type: VendingMachine pack: soviet - type: Icon - sprite: Buildings/VendingMachines/soviet.rsi + sprite: Constructible/Power/VendingMachines/soviet.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/soviet.rsi - type: entity parent: VendingMachine @@ -299,7 +343,9 @@ - type: VendingMachine pack: BODA - type: Icon - sprite: Buildings/VendingMachines/sovietsoda.rsi + sprite: Constructible/Power/VendingMachines/sovietsoda.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/sovietsoda.rsi - type: entity parent: VendingMachine @@ -309,7 +355,9 @@ - type: VendingMachine pack: Suitlord 9000 - type: Icon - sprite: Buildings/VendingMachines/suits.rsi + sprite: Constructible/Power/VendingMachines/suits.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/suits.rsi - type: entity parent: VendingMachine @@ -319,7 +367,9 @@ - type: VendingMachine pack: AutoDrobe - type: Icon - sprite: Buildings/VendingMachines/theater.rsi + sprite: Constructible/Power/VendingMachines/theater.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/theater.rsi - type: entity parent: VendingMachine @@ -329,7 +379,9 @@ - type: VendingMachine pack: Vendomat - type: Icon - sprite: Buildings/VendingMachines/vendomat.rsi + sprite: Constructible/Power/VendingMachines/vendomat.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/vendomat.rsi - type: entity parent: VendingMachine @@ -339,7 +391,9 @@ - type: VendingMachine pack: Trader Supply - type: Icon - sprite: Buildings/VendingMachines/vox.rsi + sprite: Constructible/Power/VendingMachines/vox.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/vox.rsi - type: entity parent: VendingMachine @@ -349,7 +403,9 @@ - type: VendingMachine pack: NanoMed - type: Icon - sprite: Buildings/VendingMachines/wallmed.rsi + sprite: Constructible/Power/VendingMachines/wallmed.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/wallmed.rsi - type: entity parent: VendingMachine @@ -359,4 +415,6 @@ - type: VendingMachine pack: YouTool - type: Icon - sprite: Buildings/VendingMachines/youtool.rsi + sprite: Constructible/Power/VendingMachines/youtool.rsi + - type: Sprite + sprite: Constructible/Power/VendingMachines/youtool.rsi diff --git a/Resources/Prototypes/Entities/Buildings/walls.yml b/Resources/Prototypes/Entities/Buildings/walls.yml index 82c2a78c99..accf1fa169 100644 --- a/Resources/Prototypes/Entities/Buildings/walls.yml +++ b/Resources/Prototypes/Entities/Buildings/walls.yml @@ -47,9 +47,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/brick.rsi + sprite: Constructible/Structures/Walls/brick.rsi - type: Icon - sprite: Buildings/Walls/brick.rsi + sprite: Constructible/Structures/Walls/brick.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -63,9 +63,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/clock.rsi + sprite: Constructible/Structures/Walls/clock.rsi - type: Icon - sprite: Buildings/Walls/clock.rsi + sprite: Constructible/Structures/Walls/clock.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -79,9 +79,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/clown.rsi + sprite: Constructible/Structures/Walls/clown.rsi - type: Icon - sprite: Buildings/Walls/clown.rsi + sprite: Constructible/Structures/Walls/clown.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -96,9 +96,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/cult.rsi + sprite: Constructible/Structures/Walls/cult.rsi - type: Icon - sprite: Buildings/Walls/cult.rsi + sprite: Constructible/Structures/Walls/cult.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -112,9 +112,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/debug.rsi + sprite: Constructible/Structures/Walls/debug.rsi - type: Icon - sprite: Buildings/Walls/debug.rsi + sprite: Constructible/Structures/Walls/debug.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -128,9 +128,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/diamond.rsi + sprite: Constructible/Structures/Walls/diamond.rsi - type: Icon - sprite: Buildings/Walls/diamond.rsi + sprite: Constructible/Structures/Walls/diamond.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -145,9 +145,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/gold.rsi + sprite: Constructible/Structures/Walls/gold.rsi - type: Icon - sprite: Buildings/Walls/gold.rsi + sprite: Constructible/Structures/Walls/gold.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -161,9 +161,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/ice.rsi + sprite: Constructible/Structures/Walls/ice.rsi - type: Icon - sprite: Buildings/Walls/ice.rsi + sprite: Constructible/Structures/Walls/ice.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -177,9 +177,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/metal.rsi + sprite: Constructible/Structures/Walls/metal.rsi - type: Icon - sprite: Buildings/Walls/metal.rsi + sprite: Constructible/Structures/Walls/metal.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -193,9 +193,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/plasma.rsi + sprite: Constructible/Structures/Walls/plasma.rsi - type: Icon - sprite: Buildings/Walls/plasma.rsi + sprite: Constructible/Structures/Walls/plasma.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -209,9 +209,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/plastic.rsi + sprite: Constructible/Structures/Walls/plastic.rsi - type: Icon - sprite: Buildings/Walls/plastic.rsi + sprite: Constructible/Structures/Walls/plastic.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -226,9 +226,9 @@ components: - type: Sprite color: "#889192" - sprite: Buildings/Walls/solid.rsi + sprite: Constructible/Structures/Walls/solid.rsi - type: Icon - sprite: Buildings/Walls/solid.rsi + sprite: Constructible/Structures/Walls/solid.rsi state: rgeneric - type: Destructible thresholdvalue: 300 @@ -245,9 +245,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/riveted.rsi + sprite: Constructible/Structures/Walls/riveted.rsi - type: Icon - sprite: Buildings/Walls/riveted.rsi + sprite: Constructible/Structures/Walls/riveted.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -261,9 +261,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/sandstone.rsi + sprite: Constructible/Structures/Walls/sandstone.rsi - type: Icon - sprite: Buildings/Walls/sandstone.rsi + sprite: Constructible/Structures/Walls/sandstone.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -277,9 +277,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/silver.rsi + sprite: Constructible/Structures/Walls/silver.rsi - type: Icon - sprite: Buildings/Walls/silver.rsi + sprite: Constructible/Structures/Walls/silver.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -294,13 +294,13 @@ components: - type: Sprite color: "#889192" - sprite: Buildings/Walls/solid.rsi + sprite: Constructible/Structures/Walls/solid.rsi - type: Icon - sprite: Buildings/Walls/solid.rsi + sprite: Constructible/Structures/Walls/solid.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder - destroysound: /Audio/effects/metalbreak.ogg + destroysound: /Audio/Effects/metalbreak.ogg - type: IconSmooth key: walls base: solid @@ -311,9 +311,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/uranium.rsi + sprite: Constructible/Structures/Walls/uranium.rsi - type: Icon - sprite: Buildings/Walls/uranium.rsi + sprite: Constructible/Structures/Walls/uranium.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder @@ -327,9 +327,9 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/wood.rsi + sprite: Constructible/Structures/Walls/wood.rsi - type: Icon - sprite: Buildings/Walls/wood.rsi + sprite: Constructible/Structures/Walls/wood.rsi - type: Destructible thresholdvalue: 100 spawnondestroy: Girder diff --git a/Resources/Prototypes/Entities/Buildings/windows.yml b/Resources/Prototypes/Entities/Buildings/windows.yml index c1e8435ed3..6b3be3d922 100644 --- a/Resources/Prototypes/Entities/Buildings/windows.yml +++ b/Resources/Prototypes/Entities/Buildings/windows.yml @@ -13,9 +13,9 @@ color: "#DDDDDD" netsync: false drawdepth: WallTops - sprite: Buildings/window.rsi + sprite: Constructible/Structures/Windows/window.rsi - type: Icon - sprite: Buildings/window.rsi + sprite: Constructible/Structures/Windows/window.rsi state: full - type: Collidable shapes: @@ -41,9 +41,9 @@ components: - type: Sprite drawdepth: WallTops - sprite: Buildings/rwindow.rsi + sprite: Constructible/Structures/Windows/reinforced_window.rsi - type: Window base: rwindow - type: Icon - sprite: Buildings/rwindow.rsi + sprite: Constructible/Structures/Windows/reinforced_window.rsi state: full diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 10e70bb4fd..c767cbb6b8 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -4,17 +4,8 @@ abstract: true components: - type: Sprite - sprite: Effects/weapons/arcs.rsi + sprite: Effects/arcs.rsi directional: false offset: 0.85, 0 drawdepth: Overlays - - type: MeleeWeaponArcAnimation - -- type: entity - id: WeaponTGArc - save: false - abstract: true - parent: WeaponArc - components: - - type: Sprite - sprite: Effects/weapons/tg_arcs.rsi + - type: MeleeWeaponArcAnimation \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Fluids/puddle.yml b/Resources/Prototypes/Entities/Fluids/puddle.yml index 15b0ab864c..cf4d208424 100644 --- a/Resources/Prototypes/Entities/Fluids/puddle.yml +++ b/Resources/Prototypes/Entities/Fluids/puddle.yml @@ -10,7 +10,7 @@ - type: Solution caps: 1 - type: Puddle - spill_sound: /Audio/effects/Fluids/splat.ogg + spill_sound: /Audio/Effects/Fluids/splat.ogg recolor: true - type: LoopingSound - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml index 7dbc1a155a..b1041ef75a 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml @@ -96,11 +96,11 @@ description: '' components: - type: Sprite - sprite: Clothing/OuterClothing/bedsheet.rsi + sprite: Clothing/OuterClothing/ghost_costume.rsi - type: Icon - sprite: Clothing/OuterClothing/bedsheet.rsi + sprite: Clothing/OuterClothing/ghost_costume.rsi - type: Clothing - sprite: Clothing/OuterClothing/bedsheet.rsi + sprite: Clothing/OuterClothing/ghost_costume.rsi - type: entity parent: OuterclothingBase diff --git a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml index b8127ec936..c5021b0cdb 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml @@ -5,17 +5,17 @@ description: A convenient storage pack components: - type: Sprite - sprite: Clothing/backpacks.rsi + sprite: Clothing/Back/Backpacks/backpack.rsi state: backpack - type: Icon - sprite: Clothing/backpacks.rsi + sprite: Clothing/Back/Backpacks/backpack.rsi state: backpack - type: Clothing Size: 9999 QuickEquip: false Slots: - back - sprite: Clothing/backpacks.rsi + sprite: Clothing/Back/Backpacks/backpack.rsi HeldPrefix: backpack - type: Storage Capacity: 100 @@ -27,12 +27,13 @@ description: It's a backpack made by Honk! Co. components: - type: Sprite + sprite: Clothing/Back/Backpacks/clown.rsi state: clown - - type: Icon + sprite: Clothing/Back/Backpacks/clown.rsi state: clown - - type: Clothing + sprite: Clothing/Back/Backpacks/clown.rsi HeldPrefix: clown - type: entity @@ -42,374 +43,374 @@ description: It's a very robust backpack. components: - type: Sprite + sprite: Clothing/Back/Backpacks/security.rsi state: security - - type: Icon + sprite: Clothing/Back/Backpacks/security.rsi state: security - - type: Clothing + sprite: Clothing/Back/Backpacks/security.rsi HeldPrefix: security - - type: entity parent: BackpackClothing id: BackpackEngineering name: engineering backpack components: - type: Sprite + sprite: Clothing/Back/Backpacks/engineering.rsi state: engineering - - type: Icon + sprite: Clothing/Back/Backpacks/engineering.rsi state: engineering - - type: Clothing + sprite: Clothing/Back/Backpacks/engineering.rsi HeldPrefix: engineering - - type: entity parent: BackpackClothing id: BackpackMedical name: medical backpack components: - type: Sprite + sprite: Clothing/Back/Backpacks/medical.rsi state: medical - - type: Icon + sprite: Clothing/Back/Backpacks/medical.rsi state: medical - - type: Clothing + sprite: Clothing/Back/Backpacks/medical.rsi HeldPrefix: medical - - type: entity parent: BackpackClothing id: BackpackCaptain name: captain's backpack components: - type: Sprite + sprite: Clothing/Back/Backpacks/captain.rsi state: captain - - type: Icon + sprite: Clothing/Back/Backpacks/captain.rsi state: captain - - type: Clothing + sprite: Clothing/Back/Backpacks/captain.rsi HeldPrefix: captain - - type: entity parent: BackpackClothing id: BackpackHolding name: bag of holding components: - type: Sprite + sprite: Clothing/Back/Backpacks/holding.rsi layers: - - state: holding + - state: hoding - state: holding-unlit shader: unshaded - - type: Icon + sprite: Clothing/Back/Backpacks/holding.rsi state: holding - - type: Clothing + sprite: Clothing/Back/Backpacks/holding.rsi HeldPrefix: holding - - type: entity parent: BackpackClothing id: Satchel name: satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel.rsi state: satchel - - type: Icon + sprite: Clothing/Back/Satchels/satchel.rsi state: satchel - - type: Clothing + sprite: Clothing/Back/Satchels/satchel.rsi ClothingPrefix: satchel - - type: Storage Capacity: 300 - - type: entity parent: BackpackClothing id: SatchelEngineering name: engineering satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_engineering.rsi state: satchel-engineering - - type: Icon + sprite: Clothing/Back/Satchels/satchel_engineering.rsi state: satchel-engineering - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_engineering.rsi HeldPrefix: engineering ClothingPrefix: satchel-engineering - - type: entity parent: BackpackClothing id: SatchelMedical name: medical satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_medical.rsi state: satchel-medical - - type: Icon + sprite: Clothing/Back/Satchels/satchel_medical.rsi state: satchel-medical - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_medical.rsi HeldPrefix: medical ClothingPrefix: satchel-medical - - type: entity parent: BackpackClothing id: SatchelChemistry name: chemistry satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_chemistry.rsi state: satchel-chemistry - - type: Icon + sprite: Clothing/Back/Satchels/satchel_chemistry.rsi state: satchel-chemistry - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_chemistry.rsi HeldPrefix: medical ClothingPrefix: satchel-chemistry - - type: entity parent: BackpackClothing id: SatchelGenetics name: genetics satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_genetics.rsi state: satchel-genetics - - type: Icon + sprite: Clothing/Back/Satchels/satchel_genetics.rsi state: satchel-genetics - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_genetics.rsi HeldPrefix: medical ClothingPrefix: satchel-genetics - - type: entity parent: BackpackClothing id: SatchelVirology name: virology satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_virology.rsi state: satchel-virology - - type: Icon + sprite: Clothing/Back/Satchels/satchel_virology.rsi state: satchel-virology - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_virology.rsi HeldPrefix: medical ClothingPrefix: satchel-virology - - type: entity parent: BackpackClothing id: SatchelScience name: science satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_science.rsi state: satchel-science - - type: Icon + sprite: Clothing/Back/Satchels/satchel_science.rsi state: satchel-science - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_science.rsi ClothingPrefix: satchel-science - - type: entity parent: BackpackClothing id: SatchelSecurity name: security satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_security.rsi state: satchel-security - - type: Icon + sprite: Clothing/Back/Satchels/satchel_security.rsi state: satchel-security - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_security.rsi HeldPrefix: security ClothingPrefix: satchel-security - - type: entity parent: BackpackClothing id: SatchelCaptain name: captain's satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_captain.rsi state: satchel-captain - - type: Icon + sprite: Clothing/Back/Satchels/satchel_captain.rsi state: satchel-captain - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_captain.rsi HeldPrefix: captain ClothingPrefix: satchel-captain - - type: entity parent: BackpackClothing id: SatchelHydroponics name: hydroponics satchel components: - type: Sprite + sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi state: satchel-hydroponics - - type: Icon + sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi state: satchel-hydroponics - - type: Clothing + sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi ClothingPrefix: satchel-hydroponics - - type: entity parent: BackpackClothing id: MessengerBag name: messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier.rsi state: courier - - type: Icon + sprite: Clothing/Back/Couriers/courier.rsi state: courier - - type: Clothing + sprite: Clothing/Back/Couriers/courier.rsi ClothingPrefix: courier - - type: entity parent: BackpackClothing id: MessengerBagChemistry name: chemistry messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_chemistry.rsi state: courier-chemistry - - type: Icon + sprite: Clothing/Back/Couriers/courier_chemistry.rsi state: courier-chemistry - - type: Clothing + sprite: Clothing/Back/Couriers/courier_chemistry.rsi HeldPrefix: medical ClothingPrefix: courier-chemistry - - type: entity parent: BackpackClothing id: MessengerBagMedical name: medical messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_medical.rsi state: courier-medical - - type: Icon + sprite: Clothing/Back/Couriers/courier_medical.rsi state: courier-medical - - type: Clothing + sprite: Clothing/Back/Couriers/courier_medical.rsi HeldPrefix: medical ClothingPrefix: courier-medical - - type: entity parent: BackpackClothing id: MessengerBagVirology name: virology messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_virology.rsi state: courier-virology - - type: Icon + sprite: Clothing/Back/Couriers/courier_virology.rsi state: courier-virology - - type: Clothing + sprite: Clothing/Back/Couriers/courier_virology.rsi HeldPrefix: medical ClothingPrefix: courier-virology - - type: entity parent: BackpackClothing id: MessengerBagEngineering name: engineering messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_engineering.rsi state: courier-engineering - - type: Icon + sprite: Clothing/Back/Couriers/courier_engineering.rsi state: courier-engineering - - type: Clothing + sprite: Clothing/Back/Couriers/courier_engineering.rsi HeldPrefix: engineering ClothingPrefix: courier-engineering - - type: entity parent: BackpackClothing id: MessengerBagScience name: science messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_science.rsi state: courier-science - - type: Icon + sprite: Clothing/Back/Couriers/courier_science.rsi state: courier-science - - type: Clothing + sprite: Clothing/Back/Couriers/courier_science.rsi ClothingPrefix: courier-science - - type: entity parent: BackpackClothing id: MessengerBagCaptain name: captain's messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_captain.rsi state: courier-captain - - type: Icon + sprite: Clothing/Back/Couriers/courier_captain.rsi state: courier-captain - - type: Clothing + sprite: Clothing/Back/Couriers/courier_captain.rsi HeldPrefix: captain ClothingPrefix: courier-captain - - type: entity parent: BackpackClothing id: MessengerBagHydroponics name: hydroponics messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_hydroponics.rsi state: courier-hydroponics - - type: Icon + sprite: Clothing/Back/Couriers/courier_hydroponics.rsi state: courier-hydroponics - - type: Clothing + sprite: Clothing/Back/Couriers/courier_hydroponics.rsi ClothingPrefix: courier-hydroponics - - type: entity parent: BackpackClothing id: MessengerBagSecurity name: security messenger bag components: - type: Sprite + sprite: Clothing/Back/Couriers/courier_security.rsi state: courier-security - - type: Icon + sprite: Clothing/Back/Couriers/courier_security.rsi state: courier-security - - type: Clothing + sprite: Clothing/Back/Couriers/courier_security.rsi HeldPrefix: security ClothingPrefix: courier-security diff --git a/Resources/Prototypes/Entities/Items/Clothing/belts.yml b/Resources/Prototypes/Entities/Items/Clothing/belts.yml index 6dd8aaaa07..3e372ca25d 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/belts.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/belts.yml @@ -13,15 +13,15 @@ description: Belt for holding all your usual tools components: - type: Sprite - sprite: Clothing/Belts/belt_utility.rsi + sprite: Clothing/Belt/belt_utility.rsi state: utilitybelt - type: Icon - sprite: Clothing/Belts/belt_utility.rsi + sprite: Clothing/Belt/belt_utility.rsi state: utilitybelt - type: Clothing Size: 50 QuickEquip: false - sprite: Clothing/Belts/belt_utility.rsi + sprite: Clothing/Belt/belt_utility.rsi - type: Storage Capacity: 40 # Full tool loadout is 35, plus an extra @@ -39,12 +39,12 @@ description: For holding your pants up. components: - type: Sprite - sprite: Clothing/Belts/suspenders.rsi + sprite: Clothing/Belt/suspenders.rsi state: icon - type: Icon - sprite: Clothing/Belts/suspenders.rsi + sprite: Clothing/Belt/suspenders.rsi state: icon - type: Clothing Size: 50 QuickEquip: false - sprite: Clothing/Belts/suspenders.rsi + sprite: Clothing/Belt/suspenders.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml index e018c59139..e6f9edd2b9 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml @@ -1,20 +1,15 @@ - type: entity parent: Clothing id: CloakClothing - abstract: true name: cloak + abstract: true description: components: - - type: Sprite - sprite: Clothing/cloak.rsi - - type: Icon - sprite: Clothing/cloak.rsi - type: Clothing Size: 10 QuickEquip: true Slots: - neck - sprite: Clothing/cloak.rsi - type: entity parent: CloakClothing @@ -23,10 +18,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Cloaks/cap_cloak.rsi state: capcloak - type: Icon + sprite: Clothing/Neck/Cloaks/cap_cloak.rsi state: capcloak - type: Clothing + sprite: Clothing/Neck/Cloaks/cap_cloak.rsi HeldPrefix: capcloak - type: entity @@ -36,10 +34,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Cloaks/hos_cloak.rsi state: hoscloak - type: Icon + sprite: Clothing/Neck/Cloaks/hos_cloak.rsi state: hoscloak - type: Clothing + sprite: Clothing/Neck/Cloaks/hos_cloak.rsi HeldPrefix: hoscloak - type: entity @@ -48,10 +49,13 @@ name: CE's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/ce_cloak.rsi state: cecloak - type: Icon + sprite: Clothing/Neck/Cloaks/ce_cloak.rsi state: cecloak - type: Clothing + sprite: Clothing/Neck/Cloaks/ce_cloak.rsi HeldPrefix: cecloak - type: entity @@ -60,10 +64,13 @@ name: CMO's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi state: cmocloak - type: Icon + sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi state: cmocloak - type: Clothing + sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi HeldPrefix: cmocloak - type: entity @@ -72,10 +79,13 @@ name: RD's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/rd_cloak.rsi state: rdcloak - type: Icon + sprite: Clothing/Neck/Cloaks/rd_cloak.rsi state: rdcloak - type: Clothing + sprite: Clothing/Neck/Cloaks/rd_cloak.rsi HeldPrefix: rdcloak - type: entity @@ -84,10 +94,13 @@ name: QM's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/qm_cloak.rsi state: qmcloak - type: Icon + sprite: Clothing/Neck/Cloaks/qm_cloak.rsi state: qmcloak - type: Clothing + sprite: Clothing/Neck/Cloaks/qm_cloak.rsi HeldPrefix: qmcloak - type: entity @@ -96,10 +109,13 @@ name: HoP's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/hop_cloak.rsi state: hopcloak - type: Icon + sprite: Clothing/Neck/Cloaks/hop_cloak.rsi state: hopcloak - type: Clothing + sprite: Clothing/Neck/Cloaks/hop_cloak.rsi HeldPrefix: hopcloak - type: entity @@ -108,8 +124,11 @@ name: Herald's cloak components: - type: Sprite + sprite: Clothing/Neck/Cloaks/herald_cloak.rsi state: heraldcloak - type: Icon + sprite: Clothing/Neck/Cloaks/herald_cloak.rsi state: heraldcloak - type: Clothing + sprite: Clothing/Neck/Cloaks/herald_cloak.rsi HeldPrefix: heraldcloak diff --git a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml b/Resources/Prototypes/Entities/Items/Clothing/eyes.yml index 61297a9011..ff84b68580 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/eyes.yml @@ -14,7 +14,7 @@ description: The pinnacle of modern science, wallhacks in real life components: - type: Sprite - sprite: Clothing/meson_scanners.rsi + sprite: Clothing/Glasses/meson_scanners.rsi state: meson - type: Icon sprite: Clothing/Glasses/meson_scanners.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/hats.yml b/Resources/Prototypes/Entities/Items/Clothing/hats.yml index 9f221a1962..2d6d079aa2 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/hats.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/hats.yml @@ -3117,7 +3117,7 @@ type: Sprite - sprite: Clothing/Head/wizard.rsi type: Icon - - sprite: Clothing/Head/wizard.rsi + - sprite: Clothing/Head/wiza type: Clothing parent: HatBase diff --git a/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml b/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml index 8c8170f225..0364c3a024 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml @@ -6,13 +6,13 @@ abstract: true components: - type: Sprite - sprite: Clothing/id_cards.rsi + sprite: Clothing/Belt/id_cards.rsi - type: Icon - sprite: Clothing/id_cards.rsi + sprite: Clothing/Belt/id_cards.rsi - type: Clothing Slots: - idcard - sprite: Clothing/id_cards.rsi + sprite: Clothing/Belt/id_cards.rsi HeldPrefix: default - type: Access - type: IdCard diff --git a/Resources/Prototypes/Entities/Items/Clothing/neck.yml b/Resources/Prototypes/Entities/Items/Clothing/neck.yml index 658756bfb9..1812e7ccb9 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/neck.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/neck.yml @@ -5,16 +5,11 @@ name: neck description: components: - - type: Sprite - sprite: Clothing/neck.rsi - - type: Icon - sprite: Clothing/neck.rsi - type: Clothing Size: 10 QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi - type: entity parent: NeckClothing @@ -23,10 +18,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/headphones.rsi state: headphones_on - type: Icon + sprite: Clothing/Neck/headphones.rsi state: headphones_on - type: Clothing + sprite: Clothing/Neck/headphones.rsi HeldPrefix: headphones_on - type: entity @@ -36,10 +34,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/redtie.rsi state: redtie - type: Icon + sprite: Clothing/Neck/redtie.rsi state: redtie - type: Clothing + sprite: Clothing/Neck/redtie.rsi HeldPrefix: redtie - type: entity @@ -49,10 +50,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/dettie.rsi state: dettie - type: Icon + sprite: Clothing/Neck/dettie.rsi state: dettie - type: Clothing + sprite: Clothing/Neck/dettie.rsi HeldPrefix: dettie - type: entity @@ -62,10 +66,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/stethoscope.rsi state: stethoscope - type: Icon + sprite: Clothing/Neck/stethoscope.rsi state: stethoscope - type: Clothing + sprite: Clothing/Neck/stethoscope.rsi HeldPrefix: stethoscope - type: entity @@ -75,10 +82,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Scarfs/red_scarf.rsi state: stripedredscarf - type: Icon + sprite: Clothing/Neck/Scarfs/red_scarf.rsi state: stripedredscarf - type: Clothing + sprite: Clothing/Neck/Scarfs/red_scarf.rsi HeldPrefix: stripedredscarf - type: entity @@ -88,10 +98,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Scarfs/blue_scarf.rsi state: stripedbluescarf - type: Icon + sprite: Clothing/Neck/Scarfs/blue_scarf.rsi state: stripedbluescarf - type: Clothing + sprite: Clothing/Neck/Scarfs/blue_scarf.rsi HeldPrefix: stripedbluescarf - type: entity @@ -101,10 +114,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Scarfs/green_scarf.rsi state: stripedgreenscarf - type: Icon + sprite: Clothing/Neck/Scarfs/green_scarf.rsi state: stripedgreenscarf - type: Clothing + sprite: Clothing/Neck/Scarfs/green_scarf.rsi HeldPrefix: stripedgreenscarf - type: entity @@ -114,10 +130,13 @@ description: components: - type: Sprite + sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi state: zebrascarf - type: Icon + sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi state: zebrascarf - type: Clothing + sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi HeldPrefix: zebrascarf - type: entity @@ -127,8 +146,11 @@ description: components: - type: Sprite + sprite: Clothing/Neck/bling.rsi state: bling - type: Icon + sprite: Clothing/Neck/bling.rsi state: bling - type: Clothing + sprite: Clothing/Neck/bling.rsi HeldPrefix: bling diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml index ea781a7c0d..11807a2b66 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml @@ -32,9 +32,9 @@ id: DrinkGlass components: - type: Sprite - sprite: Objects/Drinks/glass_clear.rsi + sprite: Objects/Consumable/Drinks/glass_clear.rsi - type: Icon - sprite: Objects/Drinks/glass_clear.rsi + sprite: Objects/Consumable/Drinks/glass_clear.rsi - type: Solution fillingState: glass maxVol: 50 @@ -56,9 +56,9 @@ - ReagentId: chem.Ale Quantity: 20 - type: Sprite - sprite: Objects/Drinks/aleglass.rsi + sprite: Objects/Consumable/Drinks/aleglass.rsi - type: Icon - sprite: Objects/Drinks/aleglass.rsi + sprite: Objects/Consumable/Drinks/aleglass.rsi - type: entity parent: DrinkGlassBase @@ -74,9 +74,9 @@ Quantity: 20 - type: Drink - type: Sprite - sprite: Objects/Drinks/antifreeze.rsi + sprite: Objects/Consumable/Drinks/antifreeze.rsi - type: Icon - sprite: Objects/Drinks/antifreeze.rsi + sprite: Objects/Consumable/Drinks/antifreeze.rsi - type: entity parent: DrinkGlassBase @@ -92,9 +92,9 @@ Quantity: 20 - type: Drink - type: Sprite - sprite: Objects/Drinks/atomicbombglass.rsi + sprite: Objects/Consumable/Drinks/atomicbombglass.rsi - type: Icon - sprite: Objects/Drinks/atomicbombglass.rsi + sprite: Objects/Consumable/Drinks/atomicbombglass.rsi - type: entity parent: DrinkGlassBase @@ -110,9 +110,9 @@ Quantity: 20 - type: Drink - type: Sprite - sprite: Objects/Drinks/b52glass.rsi + sprite: Objects/Consumable/Drinks/b52glass.rsi - type: Icon - sprite: Objects/Drinks/b52glass.rsi + sprite: Objects/Consumable/Drinks/b52glass.rsi - type: entity parent: DrinkGlassBase @@ -122,9 +122,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/bananahonkglass.rsi + sprite: Objects/Consumable/Drinks/bananahonkglass.rsi - type: Icon - sprite: Objects/Drinks/bananahonkglass.rsi + sprite: Objects/Consumable/Drinks/bananahonkglass.rsi - type: entity parent: DrinkGlassBase @@ -134,9 +134,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/beepskysmashglass.rsi + sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi - type: Icon - sprite: Objects/Drinks/beepskysmashglass.rsi + sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi - type: entity parent: DrinkGlassBase @@ -151,9 +151,9 @@ - ReagentId: chem.Beer Quantity: 20 - type: Sprite - sprite: Objects/Drinks/beer.rsi + sprite: Objects/Consumable/Drinks/beer.rsi - type: Icon - sprite: Objects/Drinks/beer.rsi + sprite: Objects/Consumable/Drinks/beer.rsi - type: entity parent: DrinkGlassBase @@ -168,9 +168,9 @@ - ReagentId: chem.Beer Quantity: 20 - type: Sprite - sprite: Objects/Drinks/beerglass.rsi + sprite: Objects/Consumable/Drinks/beerglass.rsi - type: Icon - sprite: Objects/Drinks/beerglass.rsi + sprite: Objects/Consumable/Drinks/beerglass.rsi - type: entity parent: DrinkGlassBase @@ -180,9 +180,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/berryjuice.rsi + sprite: Objects/Consumable/Drinks/berryjuice.rsi - type: Icon - sprite: Objects/Drinks/berryjuice.rsi + sprite: Objects/Consumable/Drinks/berryjuice.rsi - type: entity parent: DrinkGlassBase @@ -192,9 +192,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/blackrussianglass.rsi + sprite: Objects/Consumable/Drinks/blackrussianglass.rsi - type: Icon - sprite: Objects/Drinks/blackrussianglass.rsi + sprite: Objects/Consumable/Drinks/blackrussianglass.rsi - type: entity parent: DrinkGlassBase @@ -204,9 +204,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/bloodymaryglass.rsi + sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi - type: Icon - sprite: Objects/Drinks/bloodymaryglass.rsi + sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi - type: entity parent: DrinkGlassBase @@ -216,9 +216,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/booger.rsi + sprite: Objects/Consumable/Drinks/booger.rsi - type: Icon - sprite: Objects/Drinks/booger.rsi + sprite: Objects/Consumable/Drinks/booger.rsi - type: entity parent: DrinkGlassBase @@ -228,9 +228,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/bravebullglass.rsi + sprite: Objects/Consumable/Drinks/bravebullglass.rsi - type: Icon - sprite: Objects/Drinks/bravebullglass.rsi + sprite: Objects/Consumable/Drinks/bravebullglass.rsi - type: entity parent: DrinkGlassBase @@ -240,9 +240,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/brownstar.rsi + sprite: Objects/Consumable/Drinks/brownstar.rsi - type: Icon - sprite: Objects/Drinks/brownstar.rsi + sprite: Objects/Consumable/Drinks/brownstar.rsi - type: entity parent: DrinkGlassBase @@ -252,10 +252,10 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/carafe.rsi + sprite: Objects/Consumable/Drinks/carafe.rsi state: icon-10 - type: Icon - sprite: Objects/Drinks/carafe.rsi + sprite: Objects/Consumable/Drinks/carafe.rsi state: icon-10 - type: Appearance visuals: @@ -270,9 +270,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/carrotjuice.rsi + sprite: Objects/Consumable/Drinks/carrotjuice.rsi - type: Icon - sprite: Objects/Drinks/carrotjuice.rsi + sprite: Objects/Consumable/Drinks/carrotjuice.rsi - type: entity parent: DrinkGlassBase @@ -282,9 +282,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/chocolateglass.rsi + sprite: Objects/Consumable/Drinks/chocolateglass.rsi - type: Icon - sprite: Objects/Drinks/chocolateglass.rsi + sprite: Objects/Consumable/Drinks/chocolateglass.rsi - type: entity parent: DrinkGlassBase @@ -294,9 +294,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/cafe_latte.rsi + sprite: Objects/Consumable/Drinks/cafe_latte.rsi - type: Icon - sprite: Objects/Drinks/cafe_latte.rsi + sprite: Objects/Consumable/Drinks/cafe_latte.rsi - type: entity @@ -312,9 +312,9 @@ - ReagentId: chem.Coffee Quantity: 20 - type: Sprite - sprite: Objects/Drinks/coffee.rsi + sprite: Objects/Consumable/Drinks/coffee.rsi - type: Icon - sprite: Objects/Drinks/coffee.rsi + sprite: Objects/Consumable/Drinks/coffee.rsi - type: entity parent: DrinkGlassBase @@ -329,9 +329,9 @@ - ReagentId: chem.Cognac Quantity: 20 - type: Sprite - sprite: Objects/Drinks/cognacglass.rsi + sprite: Objects/Consumable/Drinks/cognacglass.rsi - type: Icon - sprite: Objects/Drinks/cognacglass.rsi + sprite: Objects/Consumable/Drinks/cognacglass.rsi - type: entity parent: DrinkGlassBase @@ -346,9 +346,9 @@ - ReagentId: chem.Cola Quantity: 20 - type: Sprite - sprite: Objects/Drinks/colabottle.rsi + sprite: Objects/Consumable/Drinks/colabottle.rsi - type: Icon - sprite: Objects/Drinks/colabottle.rsi + sprite: Objects/Consumable/Drinks/colabottle.rsi - type: entity parent: DrinkGlassBase @@ -363,9 +363,9 @@ - ReagentId: chem.Cream Quantity: 20 - type: Sprite - sprite: Objects/Drinks/cream.rsi + sprite: Objects/Consumable/Drinks/cream.rsi - type: Icon - sprite: Objects/Drinks/cream.rsi + sprite: Objects/Consumable/Drinks/cream.rsi - type: entity parent: DrinkGlassBase @@ -380,9 +380,9 @@ - ReagentId: chem.CubaLibre Quantity: 20 - type: Sprite - sprite: Objects/Drinks/cubalibreglass.rsi + sprite: Objects/Consumable/Drinks/cubalibreglass.rsi - type: Icon - sprite: Objects/Drinks/cubalibreglass.rsi + sprite: Objects/Consumable/Drinks/cubalibreglass.rsi - type: entity parent: DrinkGlassBase @@ -392,9 +392,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/curacaoglass.rsi + sprite: Objects/Consumable/Drinks/curacaoglass.rsi - type: Icon - sprite: Objects/Drinks/curacaoglass.rsi + sprite: Objects/Consumable/Drinks/curacaoglass.rsi - type: entity parent: DrinkGlassBase @@ -404,9 +404,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/demonsblood.rsi + sprite: Objects/Consumable/Drinks/demonsblood.rsi - type: Icon - sprite: Objects/Drinks/demonsblood.rsi + sprite: Objects/Consumable/Drinks/demonsblood.rsi - type: entity parent: DrinkGlassBase @@ -416,9 +416,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/detflask.rsi + sprite: Objects/Consumable/Drinks/detflask.rsi - type: Icon - sprite: Objects/Drinks/detflask.rsi + sprite: Objects/Consumable/Drinks/detflask.rsi - type: entity parent: DrinkGlassBase @@ -428,9 +428,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/devilskiss.rsi + sprite: Objects/Consumable/Drinks/devilskiss.rsi - type: Icon - sprite: Objects/Drinks/devilskiss.rsi + sprite: Objects/Consumable/Drinks/devilskiss.rsi - type: entity parent: DrinkGlassBase @@ -440,9 +440,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/doctorsdelightglass.rsi + sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi - type: Icon - sprite: Objects/Drinks/doctorsdelightglass.rsi + sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi - type: entity parent: DrinkGlassBase @@ -452,9 +452,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/driestmartiniglass.rsi + sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi - type: Icon - sprite: Objects/Drinks/driestmartiniglass.rsi + sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi - type: entity parent: DrinkGlassBase @@ -464,9 +464,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/dr_gibb_glass.rsi + sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi - type: Icon - sprite: Objects/Drinks/dr_gibb_glass.rsi + sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi - type: entity parent: DrinkGlassBase @@ -476,9 +476,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/emeraldglass.rsi + sprite: Objects/Consumable/Drinks/emeraldglass.rsi - type: Icon - sprite: Objects/Drinks/emeraldglass.rsi + sprite: Objects/Consumable/Drinks/emeraldglass.rsi - type: entity parent: DrinkGlassBase @@ -488,9 +488,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/erikasurprise.rsi + sprite: Objects/Consumable/Drinks/erikasurprise.rsi - type: Icon - sprite: Objects/Drinks/erikasurprise.rsi + sprite: Objects/Consumable/Drinks/erikasurprise.rsi - type: entity parent: DrinkGlassBase @@ -500,9 +500,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/flask.rsi + sprite: Objects/Consumable/Drinks/flask.rsi - type: Icon - sprite: Objects/Drinks/flask.rsi + sprite: Objects/Consumable/Drinks/flask.rsi - type: entity parent: DrinkGlassBase @@ -512,9 +512,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/flask_old.rsi + sprite: Objects/Consumable/Drinks/flask_old.rsi - type: Icon - sprite: Objects/Drinks/flask_old.rsi + sprite: Objects/Consumable/Drinks/flask_old.rsi - type: entity parent: DrinkGlassBase @@ -524,9 +524,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/gargleblasterglass.rsi + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi - type: Icon - sprite: Objects/Drinks/gargleblasterglass.rsi + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi - type: entity parent: DrinkGlassBase @@ -536,9 +536,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/ginfizzglass.rsi + sprite: Objects/Consumable/Drinks/ginfizzglass.rsi - type: Icon - sprite: Objects/Drinks/ginfizzglass.rsi + sprite: Objects/Consumable/Drinks/ginfizzglass.rsi - type: entity parent: DrinkGlassBase @@ -548,9 +548,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/gintonicglass.rsi + sprite: Objects/Consumable/Drinks/gintonicglass.rsi - type: Icon - sprite: Objects/Drinks/gintonicglass.rsi + sprite: Objects/Consumable/Drinks/gintonicglass.rsi - type: entity parent: DrinkGlassBase @@ -560,9 +560,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/ginvodkaglass.rsi + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi - type: Icon - sprite: Objects/Drinks/ginvodkaglass.rsi + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi - type: entity parent: DrinkGlassBase @@ -572,9 +572,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_brown.rsi + sprite: Objects/Consumable/Drinks/glass_brown.rsi - type: Icon - sprite: Objects/Drinks/glass_brown.rsi + sprite: Objects/Consumable/Drinks/glass_brown.rsi - type: entity parent: DrinkGlassBase @@ -584,9 +584,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_brown2.rsi + sprite: Objects/Consumable/Drinks/glass_brown2.rsi - type: Icon - sprite: Objects/Drinks/glass_brown2.rsi + sprite: Objects/Consumable/Drinks/glass_brown2.rsi - type: entity parent: DrinkGlassBase @@ -596,9 +596,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_clear.rsi + sprite: Objects/Consumable/Drinks/glass_clear.rsi - type: Icon - sprite: Objects/Drinks/glass_clear.rsi + sprite: Objects/Consumable/Drinks/glass_clear.rsi - type: entity parent: DrinkGlassBase @@ -608,9 +608,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_green.rsi + sprite: Objects/Consumable/Drinks/glass_green.rsi - type: Icon - sprite: Objects/Drinks/glass_green.rsi + sprite: Objects/Consumable/Drinks/glass_green.rsi - type: entity parent: DrinkGlassBase @@ -620,9 +620,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_orange.rsi + sprite: Objects/Consumable/Drinks/glass_orange.rsi - type: Icon - sprite: Objects/Drinks/glass_orange.rsi + sprite: Objects/Consumable/Drinks/glass_orange.rsi - type: entity parent: DrinkGlassBase @@ -632,9 +632,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_red.rsi + sprite: Objects/Consumable/Drinks/glass_red.rsi - type: Icon - sprite: Objects/Drinks/glass_red.rsi + sprite: Objects/Consumable/Drinks/glass_red.rsi - type: entity parent: DrinkGlassBase @@ -649,9 +649,9 @@ - ReagentId: chem.Milk Quantity: 20 - type: Sprite - sprite: Objects/Drinks/glass_white.rsi + sprite: Objects/Consumable/Drinks/glass_white.rsi - type: Icon - sprite: Objects/Drinks/glass_white.rsi + sprite: Objects/Consumable/Drinks/glass_white.rsi - type: entity parent: DrinkGlassBase @@ -661,9 +661,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/glass_yellow.rsi + sprite: Objects/Consumable/Drinks/glass_yellow.rsi - type: Icon - sprite: Objects/Drinks/glass_yellow.rsi + sprite: Objects/Consumable/Drinks/glass_yellow.rsi - type: entity parent: DrinkGlassBase @@ -673,9 +673,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/goldschlagerglass.rsi + sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi - type: Icon - sprite: Objects/Drinks/goldschlagerglass.rsi + sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi - type: entity parent: DrinkGlassBase @@ -685,9 +685,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/grapejuice.rsi + sprite: Objects/Consumable/Drinks/grapejuice.rsi - type: Icon - sprite: Objects/Drinks/grapejuice.rsi + sprite: Objects/Consumable/Drinks/grapejuice.rsi - type: entity parent: DrinkGlassBase @@ -698,9 +698,9 @@ - type: Drink isOpen: true - type: Sprite - sprite: Objects/Drinks/grenadinebottle.rsi + sprite: Objects/Consumable/Drinks/grenadinebottle.rsi - type: Icon - sprite: Objects/Drinks/grenadinebottle.rsi + sprite: Objects/Consumable/Drinks/grenadinebottle.rsi - type: entity parent: DrinkGlassBase @@ -710,9 +710,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/grenadineglass.rsi + sprite: Objects/Consumable/Drinks/grenadineglass.rsi - type: Icon - sprite: Objects/Drinks/grenadineglass.rsi + sprite: Objects/Consumable/Drinks/grenadineglass.rsi - type: entity parent: DrinkGlassBase @@ -722,9 +722,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/grogglass.rsi + sprite: Objects/Consumable/Drinks/grogglass.rsi - type: Icon - sprite: Objects/Drinks/grogglass.rsi + sprite: Objects/Consumable/Drinks/grogglass.rsi - type: entity parent: DrinkGlassBase @@ -734,9 +734,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/gsodaglass.rsi + sprite: Objects/Consumable/Drinks/gsodaglass.rsi - type: Icon - sprite: Objects/Drinks/gsodaglass.rsi + sprite: Objects/Consumable/Drinks/gsodaglass.rsi - type: entity parent: DrinkGlassBase @@ -746,9 +746,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/hell.rsi + sprite: Objects/Consumable/Drinks/hell.rsi - type: Icon - sprite: Objects/Drinks/hell.rsi + sprite: Objects/Consumable/Drinks/hell.rsi - type: entity parent: DrinkGlassBase @@ -758,9 +758,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/hippiesdelightglass.rsi + sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi - type: Icon - sprite: Objects/Drinks/hippiesdelightglass.rsi + sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi - type: entity parent: DrinkGlassBase @@ -770,9 +770,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/icedcoffeeglass.rsi + sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi - type: Icon - sprite: Objects/Drinks/icedcoffeeglass.rsi + sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi - type: entity parent: DrinkGlassBase @@ -782,9 +782,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/icedteaglass.rsi + sprite: Objects/Consumable/Drinks/icedteaglass.rsi - type: Icon - sprite: Objects/Drinks/icedteaglass.rsi + sprite: Objects/Consumable/Drinks/icedteaglass.rsi - type: entity parent: DrinkGlassBase @@ -794,9 +794,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/iced_beerglass.rsi + sprite: Objects/Consumable/Drinks/iced_beerglass.rsi - type: Icon - sprite: Objects/Drinks/iced_beerglass.rsi + sprite: Objects/Consumable/Drinks/iced_beerglass.rsi - type: entity parent: DrinkGlassBase @@ -811,9 +811,9 @@ - ReagentId: chem.Ice Quantity: 20 - type: Sprite - sprite: Objects/Drinks/iceglass.rsi + sprite: Objects/Consumable/Drinks/iceglass.rsi - type: Icon - sprite: Objects/Drinks/iceglass.rsi + sprite: Objects/Consumable/Drinks/iceglass.rsi - type: entity parent: DrinkGlassBase @@ -828,9 +828,9 @@ - ReagentId: chem.IrishCarBomb Quantity: 20 - type: Sprite - sprite: Objects/Drinks/irishcarbomb.rsi + sprite: Objects/Consumable/Drinks/irishcarbomb.rsi - type: Icon - sprite: Objects/Drinks/irishcarbomb.rsi + sprite: Objects/Consumable/Drinks/irishcarbomb.rsi - type: entity parent: DrinkGlassBase @@ -845,9 +845,9 @@ - ReagentId: chem.IrishCoffee Quantity: 20 - type: Sprite - sprite: Objects/Drinks/irishcoffeeglass.rsi + sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi - type: Icon - sprite: Objects/Drinks/irishcoffeeglass.rsi + sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi - type: entity parent: DrinkGlassBase @@ -862,9 +862,9 @@ - ReagentId: chem.IrishCream Quantity: 20 - type: Sprite - sprite: Objects/Drinks/irishcreamglass.rsi + sprite: Objects/Consumable/Drinks/irishcreamglass.rsi - type: Icon - sprite: Objects/Drinks/irishcreamglass.rsi + sprite: Objects/Consumable/Drinks/irishcreamglass.rsi - type: entity parent: DrinkGlassBase @@ -874,9 +874,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/jar.rsi + sprite: Objects/Consumable/Drinks/jar.rsi - type: Icon - sprite: Objects/Drinks/jar.rsi + sprite: Objects/Consumable/Drinks/jar.rsi - type: entity parent: DrinkGlassBase @@ -886,9 +886,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/jar_metroid.rsi + sprite: Objects/Consumable/Drinks/jar_metroid.rsi - type: Icon - sprite: Objects/Drinks/jar_metroid.rsi + sprite: Objects/Consumable/Drinks/jar_metroid.rsi - type: entity parent: DrinkGlassBase @@ -898,9 +898,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/jar_what.rsi + sprite: Objects/Consumable/Drinks/jar_what.rsi - type: Icon - sprite: Objects/Drinks/jar_what.rsi + sprite: Objects/Consumable/Drinks/jar_what.rsi - type: entity parent: DrinkGlassBase @@ -915,9 +915,9 @@ - ReagentId: chem.Kahlua Quantity: 20 - type: Sprite - sprite: Objects/Drinks/kahluaglass.rsi + sprite: Objects/Consumable/Drinks/kahluaglass.rsi - type: Icon - sprite: Objects/Drinks/kahluaglass.rsi + sprite: Objects/Consumable/Drinks/kahluaglass.rsi - type: entity parent: DrinkGlassBase @@ -927,9 +927,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/kiraspecial.rsi - type: Icon - sprite: Objects/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/kiraspecial.rsi - type: entity parent: DrinkGlassBase @@ -939,9 +939,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lemonade.rsi + sprite: Objects/Consumable/Drinks/lemonade.rsi - type: Icon - sprite: Objects/Drinks/lemonade.rsi + sprite: Objects/Consumable/Drinks/lemonade.rsi - type: entity parent: DrinkGlassBase @@ -951,9 +951,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lemonadeglass.rsi + sprite: Objects/Consumable/Drinks/lemonadeglass.rsi - type: Icon - sprite: Objects/Drinks/lemonadeglass.rsi + sprite: Objects/Consumable/Drinks/lemonadeglass.rsi - type: entity parent: DrinkGlassBase @@ -963,9 +963,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lemonglass.rsi + sprite: Objects/Consumable/Drinks/lemonglass.rsi - type: Icon - sprite: Objects/Drinks/lemonglass.rsi + sprite: Objects/Consumable/Drinks/lemonglass.rsi - type: entity parent: DrinkGlassBase @@ -975,9 +975,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lemonjuice.rsi + sprite: Objects/Consumable/Drinks/lemonjuice.rsi - type: Icon - sprite: Objects/Drinks/lemonjuice.rsi + sprite: Objects/Consumable/Drinks/lemonjuice.rsi - type: entity parent: DrinkGlassBase @@ -987,9 +987,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lemonlime.rsi + sprite: Objects/Consumable/Drinks/lemonlime.rsi - type: Icon - sprite: Objects/Drinks/lemonlime.rsi + sprite: Objects/Consumable/Drinks/lemonlime.rsi - type: entity parent: DrinkGlassBase @@ -999,9 +999,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/limejuice.rsi + sprite: Objects/Consumable/Drinks/limejuice.rsi - type: Icon - sprite: Objects/Drinks/limejuice.rsi + sprite: Objects/Consumable/Drinks/limejuice.rsi - type: entity parent: DrinkGlassBase @@ -1011,9 +1011,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/lithiumflask.rsi + sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: Icon - sprite: Objects/Drinks/lithiumflask.rsi + sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: entity parent: DrinkGlassBase @@ -1023,9 +1023,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/longislandicedteaglass.rsi + sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi - type: Icon - sprite: Objects/Drinks/longislandicedteaglass.rsi + sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi - type: entity parent: DrinkGlassBase @@ -1035,9 +1035,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/manhattanglass.rsi + sprite: Objects/Consumable/Drinks/manhattanglass.rsi - type: Icon - sprite: Objects/Drinks/manhattanglass.rsi + sprite: Objects/Consumable/Drinks/manhattanglass.rsi - type: entity parent: DrinkGlassBase @@ -1052,9 +1052,9 @@ - ReagentId: chem.ManlyDorf Quantity: 20 - type: Sprite - sprite: Objects/Drinks/manlydorfglass.rsi + sprite: Objects/Consumable/Drinks/manlydorfglass.rsi - type: Icon - sprite: Objects/Drinks/manlydorfglass.rsi + sprite: Objects/Consumable/Drinks/manlydorfglass.rsi - type: entity parent: DrinkGlassBase @@ -1064,9 +1064,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/margaritaglass.rsi + sprite: Objects/Consumable/Drinks/margaritaglass.rsi - type: Icon - sprite: Objects/Drinks/margaritaglass.rsi + sprite: Objects/Consumable/Drinks/margaritaglass.rsi - type: entity parent: DrinkGlassBase @@ -1076,9 +1076,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/martiniglass.rsi + sprite: Objects/Consumable/Drinks/martiniglass.rsi - type: Icon - sprite: Objects/Drinks/martiniglass.rsi + sprite: Objects/Consumable/Drinks/martiniglass.rsi - type: entity parent: DrinkGlassBase @@ -1088,9 +1088,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/meadglass.rsi + sprite: Objects/Consumable/Drinks/meadglass.rsi - type: Icon - sprite: Objects/Drinks/meadglass.rsi + sprite: Objects/Consumable/Drinks/meadglass.rsi - type: entity parent: DrinkGlassBase @@ -1105,9 +1105,9 @@ - ReagentId: chem.Milk Quantity: 20 - type: Sprite - sprite: Objects/Drinks/milk.rsi + sprite: Objects/Consumable/Drinks/milk.rsi - type: Icon - sprite: Objects/Drinks/milk.rsi + sprite: Objects/Consumable/Drinks/milk.rsi - type: entity parent: DrinkGlassBase @@ -1117,9 +1117,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/milkshake.rsi + sprite: Objects/Consumable/Drinks/milkshake.rsi - type: Icon - sprite: Objects/Drinks/milkshake.rsi + sprite: Objects/Consumable/Drinks/milkshake.rsi - type: entity parent: DrinkGlassBase @@ -1129,9 +1129,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/mojito.rsi + sprite: Objects/Consumable/Drinks/mojito.rsi - type: Icon - sprite: Objects/Drinks/mojito.rsi + sprite: Objects/Consumable/Drinks/mojito.rsi - type: entity parent: DrinkGlassBase @@ -1141,9 +1141,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/neurotoxinglass.rsi + sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi - type: Icon - sprite: Objects/Drinks/neurotoxinglass.rsi + sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi - type: entity parent: DrinkGlassBase @@ -1153,9 +1153,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/nothing.rsi + sprite: Objects/Consumable/Drinks/nothing.rsi - type: Icon - sprite: Objects/Drinks/nothing.rsi + sprite: Objects/Consumable/Drinks/nothing.rsi - type: entity parent: DrinkGlassBase @@ -1165,9 +1165,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/ntcahors.rsi + sprite: Objects/Consumable/Drinks/ntcahors.rsi - type: Icon - sprite: Objects/Drinks/ntcahors.rsi + sprite: Objects/Consumable/Drinks/ntcahors.rsi - type: entity parent: DrinkGlassBase @@ -1177,9 +1177,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/nuka_colaglass.rsi + sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi - type: Icon - sprite: Objects/Drinks/nuka_colaglass.rsi + sprite: Objects/Consumable/Drinks/nuka_colaglass.rsi - type: entity parent: DrinkGlassBase @@ -1189,9 +1189,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/orangejuice.rsi + sprite: Objects/Consumable/Drinks/orangejuice.rsi - type: Icon - sprite: Objects/Drinks/orangejuice.rsi + sprite: Objects/Consumable/Drinks/orangejuice.rsi - type: entity parent: DrinkGlassBase @@ -1201,9 +1201,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/patronglass.rsi + sprite: Objects/Consumable/Drinks/patronglass.rsi - type: Icon - sprite: Objects/Drinks/patronglass.rsi + sprite: Objects/Consumable/Drinks/patronglass.rsi - type: entity parent: DrinkGlassBase @@ -1213,9 +1213,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/poisonberryjuice.rsi + sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi - type: Icon - sprite: Objects/Drinks/poisonberryjuice.rsi + sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi - type: entity parent: DrinkGlassBase @@ -1225,9 +1225,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/proj_manhattanglass.rsi + sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi - type: Icon - sprite: Objects/Drinks/proj_manhattanglass.rsi + sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi - type: entity parent: DrinkGlassBase @@ -1237,9 +1237,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/pwineglass.rsi + sprite: Objects/Consumable/Drinks/pwineglass.rsi - type: Icon - sprite: Objects/Drinks/pwineglass.rsi + sprite: Objects/Consumable/Drinks/pwineglass.rsi - type: entity parent: DrinkGlassBase @@ -1249,9 +1249,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rag.rsi + sprite: Objects/Consumable/Drinks/rag.rsi - type: Icon - sprite: Objects/Drinks/rag.rsi + sprite: Objects/Consumable/Drinks/rag.rsi - type: entity parent: DrinkGlassBase @@ -1261,9 +1261,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rag_lit.rsi + sprite: Objects/Consumable/Drinks/rag_lit.rsi - type: Icon - sprite: Objects/Drinks/rag_lit.rsi + sprite: Objects/Consumable/Drinks/rag_lit.rsi - type: entity parent: DrinkGlassBase @@ -1273,9 +1273,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rag_small.rsi + sprite: Objects/Consumable/Drinks/rag_small.rsi - type: Icon - sprite: Objects/Drinks/rag_small.rsi + sprite: Objects/Consumable/Drinks/rag_small.rsi - type: entity parent: DrinkGlassBase @@ -1285,9 +1285,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rag_small_lit.rsi + sprite: Objects/Consumable/Drinks/rag_small_lit.rsi - type: Icon - sprite: Objects/Drinks/rag_small_lit.rsi + sprite: Objects/Consumable/Drinks/rag_small_lit.rsi - type: entity parent: DrinkGlassBase @@ -1297,9 +1297,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/ramen.rsi + sprite: Objects/Consumable/Drinks/ramen.rsi - type: Icon - sprite: Objects/Drinks/ramen.rsi + sprite: Objects/Consumable/Drinks/ramen.rsi - type: entity parent: DrinkGlassBase @@ -1309,9 +1309,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/red_meadglass.rsi + sprite: Objects/Consumable/Drinks/red_meadglass.rsi - type: Icon - sprite: Objects/Drinks/red_meadglass.rsi + sprite: Objects/Consumable/Drinks/red_meadglass.rsi - type: entity parent: DrinkGlassBase @@ -1321,9 +1321,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rewriter.rsi + sprite: Objects/Consumable/Drinks/rewriter.rsi - type: Icon - sprite: Objects/Drinks/rewriter.rsi + sprite: Objects/Consumable/Drinks/rewriter.rsi - type: entity parent: DrinkGlassBase @@ -1333,9 +1333,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rumglass.rsi + sprite: Objects/Consumable/Drinks/rumglass.rsi - type: Icon - sprite: Objects/Drinks/rumglass.rsi + sprite: Objects/Consumable/Drinks/rumglass.rsi - type: entity parent: DrinkGlassBase @@ -1345,9 +1345,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/sbitenglass.rsi + sprite: Objects/Consumable/Drinks/sbitenglass.rsi - type: Icon - sprite: Objects/Drinks/sbitenglass.rsi + sprite: Objects/Consumable/Drinks/sbitenglass.rsi - type: entity parent: DrinkGlassBase @@ -1357,9 +1357,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/screwdriverglass.rsi + sprite: Objects/Consumable/Drinks/screwdriverglass.rsi - type: Icon - sprite: Objects/Drinks/screwdriverglass.rsi + sprite: Objects/Consumable/Drinks/screwdriverglass.rsi - type: entity parent: DrinkGlassBase @@ -1369,9 +1369,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/sdreamglass.rsi + sprite: Objects/Consumable/Drinks/sdreamglass.rsi - type: Icon - sprite: Objects/Drinks/sdreamglass.rsi + sprite: Objects/Consumable/Drinks/sdreamglass.rsi - type: entity parent: DrinkGlassBase @@ -1381,9 +1381,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shake-blue.rsi + sprite: Objects/Consumable/Drinks/shake-blue.rsi - type: Icon - sprite: Objects/Drinks/shake-blue.rsi + sprite: Objects/Consumable/Drinks/shake-blue.rsi # TODO: MOVE - type: entity @@ -1394,9 +1394,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shake-empty.rsi + sprite: Objects/Consumable/Drinks/shake-empty.rsi - type: Icon - sprite: Objects/Drinks/shake-empty.rsi + sprite: Objects/Consumable/Drinks/shake-empty.rsi - type: entity parent: DrinkGlassBase @@ -1406,9 +1406,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shake-meat.rsi + sprite: Objects/Consumable/Drinks/shake-meat.rsi - type: Icon - sprite: Objects/Drinks/shake-meat.rsi + sprite: Objects/Consumable/Drinks/shake-meat.rsi - type: entity parent: DrinkGlassBase @@ -1418,9 +1418,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shake-robo.rsi + sprite: Objects/Consumable/Drinks/shake-robo.rsi - type: Icon - sprite: Objects/Drinks/shake-robo.rsi + sprite: Objects/Consumable/Drinks/shake-robo.rsi - type: entity parent: DrinkGlassBase @@ -1430,9 +1430,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shake-white.rsi + sprite: Objects/Consumable/Drinks/shake-white.rsi - type: Icon - sprite: Objects/Drinks/shake-white.rsi + sprite: Objects/Consumable/Drinks/shake-white.rsi # TODO: Move to containers - type: entity @@ -1443,9 +1443,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shaker.rsi + sprite: Objects/Consumable/Drinks/shaker.rsi - type: Icon - sprite: Objects/Drinks/shaker.rsi + sprite: Objects/Consumable/Drinks/shaker.rsi - type: entity parent: DrinkGlassBase @@ -1455,9 +1455,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shinyflask.rsi + sprite: Objects/Consumable/Drinks/shinyflask.rsi - type: Icon - sprite: Objects/Drinks/shinyflask.rsi + sprite: Objects/Consumable/Drinks/shinyflask.rsi - type: entity parent: DrinkGlassBase @@ -1467,9 +1467,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/shotglass.rsi + sprite: Objects/Consumable/Drinks/shotglass.rsi - type: Icon - sprite: Objects/Drinks/shotglass.rsi + sprite: Objects/Consumable/Drinks/shotglass.rsi - type: entity parent: DrinkGlassBase @@ -1479,9 +1479,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/silencerglass.rsi + sprite: Objects/Consumable/Drinks/silencerglass.rsi - type: Icon - sprite: Objects/Drinks/silencerglass.rsi + sprite: Objects/Consumable/Drinks/silencerglass.rsi - type: entity parent: DrinkGlassBase @@ -1491,9 +1491,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/singulo.rsi + sprite: Objects/Consumable/Drinks/singulo.rsi - type: Icon - sprite: Objects/Drinks/singulo.rsi + sprite: Objects/Consumable/Drinks/singulo.rsi - type: entity parent: DrinkGlassBase @@ -1503,9 +1503,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/snowwhite.rsi + sprite: Objects/Consumable/Drinks/snowwhite.rsi - type: Icon - sprite: Objects/Drinks/snowwhite.rsi + sprite: Objects/Consumable/Drinks/snowwhite.rsi - type: entity parent: DrinkGlassBase @@ -1515,9 +1515,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/sodawater.rsi + sprite: Objects/Consumable/Drinks/sodawater.rsi - type: Icon - sprite: Objects/Drinks/sodawater.rsi + sprite: Objects/Consumable/Drinks/sodawater.rsi - type: entity parent: DrinkGlassBase @@ -1527,9 +1527,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/soymilk.rsi + sprite: Objects/Consumable/Drinks/soymilk.rsi - type: Icon - sprite: Objects/Drinks/soymilk.rsi + sprite: Objects/Consumable/Drinks/soymilk.rsi - type: entity parent: DrinkGlassBase @@ -1539,9 +1539,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/soy_latte.rsi + sprite: Objects/Consumable/Drinks/soy_latte.rsi - type: Icon - sprite: Objects/Drinks/soy_latte.rsi + sprite: Objects/Consumable/Drinks/soy_latte.rsi - type: entity parent: DrinkGlassBase @@ -1551,9 +1551,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/space-up_bottle.rsi + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - type: Icon - sprite: Objects/Drinks/space-up_bottle.rsi + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - type: entity parent: DrinkGlassBase @@ -1563,9 +1563,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/space-up_glass.rsi + sprite: Objects/Consumable/Drinks/space-up_glass.rsi - type: Icon - sprite: Objects/Drinks/space-up_glass.rsi + sprite: Objects/Consumable/Drinks/space-up_glass.rsi - type: entity parent: DrinkGlassBase @@ -1575,9 +1575,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/space_mountain_wind_bottle.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - type: Icon - sprite: Objects/Drinks/space_mountain_wind_bottle.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - type: entity parent: DrinkGlassBase @@ -1587,9 +1587,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/space_mountain_wind_glass.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi - type: Icon - sprite: Objects/Drinks/space_mountain_wind_glass.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi - type: entity parent: DrinkGlassBase @@ -1604,9 +1604,9 @@ - ReagentId: chem.SyndicateBomb Quantity: 20 - type: Sprite - sprite: Objects/Drinks/syndicatebomb.rsi + sprite: Objects/Consumable/Drinks/syndicatebomb.rsi - type: Icon - sprite: Objects/Drinks/syndicatebomb.rsi + sprite: Objects/Consumable/Drinks/syndicatebomb.rsi - type: entity parent: DrinkGlassBase @@ -1621,9 +1621,9 @@ - ReagentId: chem.Tea Quantity: 20 - type: Sprite - sprite: Objects/Drinks/teaglass.rsi + sprite: Objects/Consumable/Drinks/teaglass.rsi - type: Icon - sprite: Objects/Drinks/teaglass.rsi + sprite: Objects/Consumable/Drinks/teaglass.rsi - type: entity parent: DrinkGlassBase @@ -1638,9 +1638,9 @@ - ReagentId: chem.Tea Quantity: 20 - type: Sprite - sprite: Objects/Drinks/teapot.rsi + sprite: Objects/Consumable/Drinks/teapot.rsi - type: Icon - sprite: Objects/Drinks/teapot.rsi + sprite: Objects/Consumable/Drinks/teapot.rsi - type: entity parent: DrinkGlassBase @@ -1650,9 +1650,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/tequillaglass.rsi + sprite: Objects/Consumable/Drinks/tequillaglass.rsi - type: Icon - sprite: Objects/Drinks/tequillaglass.rsi + sprite: Objects/Consumable/Drinks/tequillaglass.rsi - type: entity parent: DrinkGlassBase @@ -1662,9 +1662,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/tequillasunriseglass.rsi + sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi - type: Icon - sprite: Objects/Drinks/tequillasunriseglass.rsi + sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi - type: entity parent: DrinkGlassBase @@ -1674,9 +1674,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/thirteen_loko_glass.rsi + sprite: Objects/Consumable/Drinks/thirteen_loko_glass.rsi - type: Icon - sprite: Objects/Drinks/thirteen_loko_glass.rsi + sprite: Objects/Consumable/Drinks/thirteen_loko_glass.rsi - type: entity parent: DrinkGlassBase @@ -1686,9 +1686,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/threemileislandglass.rsi + sprite: Objects/Consumable/Drinks/threemileislandglass.rsi - type: Icon - sprite: Objects/Drinks/threemileislandglass.rsi + sprite: Objects/Consumable/Drinks/threemileislandglass.rsi - type: entity parent: DrinkGlassBase @@ -1698,9 +1698,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/tomatojuice.rsi + sprite: Objects/Consumable/Drinks/tomatojuice.rsi - type: Icon - sprite: Objects/Drinks/tomatojuice.rsi + sprite: Objects/Consumable/Drinks/tomatojuice.rsi - type: entity parent: DrinkGlassBase @@ -1710,9 +1710,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/tonic.rsi + sprite: Objects/Consumable/Drinks/tonic.rsi - type: Icon - sprite: Objects/Drinks/tonic.rsi + sprite: Objects/Consumable/Drinks/tonic.rsi - type: entity parent: DrinkGlassBase @@ -1722,9 +1722,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/toxinsspecialglass.rsi + sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi - type: Icon - sprite: Objects/Drinks/toxinsspecialglass.rsi + sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi - type: entity parent: DrinkGlassBase @@ -1734,9 +1734,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/vacuumflask.rsi + sprite: Objects/Consumable/Drinks/vacuumflask.rsi - type: Icon - sprite: Objects/Drinks/vacuumflask.rsi + sprite: Objects/Consumable/Drinks/vacuumflask.rsi - type: entity parent: DrinkGlassBase @@ -1746,9 +1746,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/vermouthglass.rsi + sprite: Objects/Consumable/Drinks/vermouthglass.rsi - type: Icon - sprite: Objects/Drinks/vermouthglass.rsi + sprite: Objects/Consumable/Drinks/vermouthglass.rsi - type: entity parent: DrinkGlassBase @@ -1758,9 +1758,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/vodkatonicglass.rsi + sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi - type: Icon - sprite: Objects/Drinks/vodkatonicglass.rsi + sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi - type: entity parent: DrinkGlassBase @@ -1770,9 +1770,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/water.rsi + sprite: Objects/Consumable/Drinks/water.rsi - type: Icon - sprite: Objects/Drinks/water.rsi + sprite: Objects/Consumable/Drinks/water.rsi - type: entity parent: DrinkGlassBase @@ -1782,9 +1782,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/waterbottle.rsi + sprite: Objects/Consumable/Drinks/waterbottle.rsi - type: Icon - sprite: Objects/Drinks/waterbottle.rsi + sprite: Objects/Consumable/Drinks/waterbottle.rsi - type: entity parent: DrinkGlassBase @@ -1794,9 +1794,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/watermelon.rsi + sprite: Objects/Consumable/Drinks/watermelon.rsi - type: Icon - sprite: Objects/Drinks/watermelon.rsi + sprite: Objects/Consumable/Drinks/watermelon.rsi - type: entity parent: DrinkGlassBase @@ -1806,10 +1806,10 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/water_cup.rsi + sprite: Objects/Consumable/Drinks/water_cup.rsi state: icon-1 - type: Icon - sprite: Objects/Drinks/water_cup.rsi + sprite: Objects/Consumable/Drinks/water_cup.rsi state: icon-1 - type: Appearance visuals: @@ -1829,9 +1829,9 @@ - ReagentId: chem.WhiskeyCola Quantity: 20 - type: Sprite - sprite: Objects/Drinks/whiskeycolaglass.rsi + sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi - type: Icon - sprite: Objects/Drinks/whiskeycolaglass.rsi + sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi - type: entity parent: DrinkGlassBase @@ -1846,9 +1846,9 @@ - ReagentId: chem.Whiskey Quantity: 20 - type: Sprite - sprite: Objects/Drinks/whiskeyglass.rsi + sprite: Objects/Consumable/Drinks/whiskeyglass.rsi - type: Icon - sprite: Objects/Drinks/whiskeyglass.rsi + sprite: Objects/Consumable/Drinks/whiskeyglass.rsi - type: entity parent: DrinkGlassBase @@ -1858,9 +1858,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/whiskeysodaglass.rsi + sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi - type: Icon - sprite: Objects/Drinks/whiskeysodaglass.rsi + sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi - type: entity parent: DrinkGlassBase @@ -1870,9 +1870,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/whiskeysodaglass2.rsi + sprite: Objects/Consumable/Drinks/whiskeysodaglass2.rsi - type: Icon - sprite: Objects/Drinks/whiskeysodaglass2.rsi + sprite: Objects/Consumable/Drinks/whiskeysodaglass2.rsi - type: entity parent: DrinkGlassBase @@ -1882,9 +1882,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/whiterussianglass.rsi + sprite: Objects/Consumable/Drinks/whiterussianglass.rsi - type: Icon - sprite: Objects/Drinks/whiterussianglass.rsi + sprite: Objects/Consumable/Drinks/whiterussianglass.rsi - type: entity parent: DrinkGlassBase @@ -1899,6 +1899,6 @@ - ReagentId: chem.Wine Quantity: 20 - type: Sprite - sprite: Objects/Drinks/wineglass.rsi + sprite: Objects/Consumable/Drinks/wineglass.rsi - type: Icon - sprite: Objects/Drinks/wineglass.rsi + sprite: Objects/Consumable/Drinks/wineglass.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml index d6c8f8fd3c..7e153d80b8 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml @@ -22,9 +22,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/absinthebottle.rsi + sprite: Objects/Consumable/Drinks/absinthebottle.rsi - type: Icon - sprite: Objects/Drinks/absinthebottle.rsi + sprite: Objects/Consumable/Drinks/absinthebottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -34,9 +34,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/alco-green.rsi + sprite: Objects/Consumable/Drinks/alco-green.rsi - type: Icon - sprite: Objects/Drinks/alco-green.rsi + sprite: Objects/Consumable/Drinks/alco-green.rsi - type: entity parent: DrinkBottleBaseFull @@ -51,9 +51,9 @@ - ReagentId: chem.Ale Quantity: 80 - type: Sprite - sprite: Objects/Drinks/alebottle.rsi + sprite: Objects/Consumable/Drinks/alebottle.rsi - type: Icon - sprite: Objects/Drinks/alebottle.rsi + sprite: Objects/Consumable/Drinks/alebottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -63,9 +63,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/bottleofnothing.rsi + sprite: Objects/Consumable/Drinks/bottleofnothing.rsi - type: Icon - sprite: Objects/Drinks/bottleofnothing.rsi + sprite: Objects/Consumable/Drinks/bottleofnothing.rsi - type: entity parent: DrinkBottleBaseFull @@ -80,9 +80,9 @@ - ReagentId: chem.Cognac Quantity: 80 - type: Sprite - sprite: Objects/Drinks/cognacbottle.rsi + sprite: Objects/Consumable/Drinks/cognacbottle.rsi - type: Icon - sprite: Objects/Drinks/cognacbottle.rsi + sprite: Objects/Consumable/Drinks/cognacbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -92,9 +92,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/ginbottle.rsi + sprite: Objects/Consumable/Drinks/ginbottle.rsi - type: Icon - sprite: Objects/Drinks/ginbottle.rsi + sprite: Objects/Consumable/Drinks/ginbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -104,9 +104,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/goldschlagerbottle.rsi + sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi - type: Icon - sprite: Objects/Drinks/goldschlagerbottle.rsi + sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -121,9 +121,9 @@ - ReagentId: chem.H2O Quantity: 80 - type: Sprite - sprite: Objects/Drinks/kahluabottle.rsi + sprite: Objects/Consumable/Drinks/kahluabottle.rsi - type: Icon - sprite: Objects/Drinks/kahluabottle.rsi + sprite: Objects/Consumable/Drinks/kahluabottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -133,9 +133,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/patronbottle.rsi + sprite: Objects/Consumable/Drinks/patronbottle.rsi - type: Icon - sprite: Objects/Drinks/patronbottle.rsi + sprite: Objects/Consumable/Drinks/patronbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -145,9 +145,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/pwinebottle.rsi + sprite: Objects/Consumable/Drinks/pwinebottle.rsi - type: Icon - sprite: Objects/Drinks/pwinebottle.rsi + sprite: Objects/Consumable/Drinks/pwinebottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -157,9 +157,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/rumbottle.rsi + sprite: Objects/Consumable/Drinks/rumbottle.rsi - type: Icon - sprite: Objects/Drinks/rumbottle.rsi + sprite: Objects/Consumable/Drinks/rumbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -169,9 +169,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/tequillabottle.rsi + sprite: Objects/Consumable/Drinks/tequillabottle.rsi - type: Icon - sprite: Objects/Drinks/tequillabottle.rsi + sprite: Objects/Consumable/Drinks/tequillabottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -181,9 +181,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/vermouthbottle.rsi + sprite: Objects/Consumable/Drinks/vermouthbottle.rsi - type: Icon - sprite: Objects/Drinks/vermouthbottle.rsi + sprite: Objects/Consumable/Drinks/vermouthbottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -198,9 +198,9 @@ - ReagentId: chem.Vodka Quantity: 80 - type: Sprite - sprite: Objects/Drinks/vodkabottle.rsi + sprite: Objects/Consumable/Drinks/vodkabottle.rsi - type: Icon - sprite: Objects/Drinks/vodkabottle.rsi + sprite: Objects/Consumable/Drinks/vodkabottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -215,9 +215,9 @@ - ReagentId: chem.Whiskey Quantity: 80 - type: Sprite - sprite: Objects/Drinks/whiskeybottle.rsi + sprite: Objects/Consumable/Drinks/whiskeybottle.rsi - type: Icon - sprite: Objects/Drinks/whiskeybottle.rsi + sprite: Objects/Consumable/Drinks/whiskeybottle.rsi - type: entity parent: DrinkBottleBaseFull @@ -232,6 +232,6 @@ - ReagentId: chem.Wine Quantity: 80 - type: Sprite - sprite: Objects/Drinks/winebottle.rsi + sprite: Objects/Consumable/Drinks/winebottle.rsi - type: Icon - sprite: Objects/Drinks/winebottle.rsi + sprite: Objects/Consumable/Drinks/winebottle.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml index 22ed64edb5..e148996027 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml @@ -27,11 +27,11 @@ components: - type: Solution - type: Sprite - sprite: Objects/Drinks/cola.rsi + sprite: Objects/Consumable/Drinks/cola.rsi - type: Icon - sprite: Objects/Drinks/cola.rsi + sprite: Objects/Consumable/Drinks/cola.rsi - type: Item - sprite: Objects/Drinks/cola.rsi + sprite: Objects/Consumable/Drinks/cola.rsi - type: entity parent: DrinkCanBaseFull @@ -40,11 +40,11 @@ description: '' components: - type: Sprite - sprite: Objects/Drinks/ice_tea_can.rsi + sprite: Objects/Consumable/Drinks/ice_tea_can.rsi - type: Icon - sprite: Objects/Drinks/ice_tea_can.rsi + sprite: Objects/Consumable/Drinks/ice_tea_can.rsi - type: Item - sprite: Objects/Drinks/ice_tea_can.rsi + sprite: Objects/Consumable/Drinks/ice_tea_can.rsi - type: entity parent: DrinkCanBaseFull @@ -53,11 +53,11 @@ description: You wanted ORANGE. It gave you Lemon Lime. components: - type: Sprite - sprite: Objects/Drinks/lemon-lime.rsi + sprite: Objects/Consumable/Drinks/lemon-lime.rsi - type: Icon - sprite: Objects/Drinks/lemon-lime.rsi + sprite: Objects/Consumable/Drinks/lemon-lime.rsi - type: Item - sprite: Objects/Drinks/lemon-lime.rsi + sprite: Objects/Consumable/Drinks/lemon-lime.rsi - type: entity parent: DrinkCanBaseFull @@ -66,11 +66,11 @@ description: 'Sweetened drink with a grape flavor and a deep purple color.' components: - type: Sprite - sprite: Objects/Drinks/purple_can.rsi + sprite: Objects/Consumable/Drinks/purple_can.rsi - type: Icon - sprite: Objects/Drinks/purple_can.rsi + sprite: Objects/Consumable/Drinks/purple_can.rsi - type: Item - sprite: Objects/Drinks/purple_can.rsi + sprite: Objects/Consumable/Drinks/purple_can.rsi - type: entity parent: DrinkCanBaseFull @@ -79,11 +79,11 @@ description: Blows right through you like a space wind. components: - type: Sprite - sprite: Objects/Drinks/space_mountain_wind.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi - type: Icon - sprite: Objects/Drinks/space_mountain_wind.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi - type: Item - sprite: Objects/Drinks/space_mountain_wind.rsi + sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi - type: entity parent: DrinkCanBaseFull @@ -92,11 +92,11 @@ description: Tastes like a hull breach in your mouth. components: - type: Sprite - sprite: Objects/Drinks/space-up.rsi + sprite: Objects/Consumable/Drinks/space-up.rsi - type: Icon - sprite: Objects/Drinks/space-up.rsi + sprite: Objects/Consumable/Drinks/space-up.rsi - type: Item - sprite: Objects/Drinks/space-up.rsi + sprite: Objects/Consumable/Drinks/space-up.rsi - type: entity parent: DrinkCanBaseFull @@ -105,11 +105,11 @@ description: The taste of a star in liquid form. And, a bit of tuna...? components: - type: Sprite - sprite: Objects/Drinks/starkist.rsi + sprite: Objects/Consumable/Drinks/starkist.rsi - type: Icon - sprite: Objects/Drinks/starkist.rsi + sprite: Objects/Consumable/Drinks/starkist.rsi - type: Item - sprite: Objects/Drinks/starkist.rsi + sprite: Objects/Consumable/Drinks/starkist.rsi - type: entity parent: DrinkCanBaseFull @@ -118,11 +118,11 @@ description: The MBO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly. components: - type: Sprite - sprite: Objects/Drinks/thirteen_loko.rsi + sprite: Objects/Consumable/Drinks/thirteen_loko.rsi - type: Icon - sprite: Objects/Drinks/thirteen_loko.rsi + sprite: Objects/Consumable/Drinks/thirteen_loko.rsi - type: Item - sprite: Objects/Drinks/thirteen_loko.rsi + sprite: Objects/Consumable/Drinks/thirteen_loko.rsi - type: entity parent: DrinkCanBaseFull @@ -132,11 +132,11 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/changelingsting.rsi + sprite: Objects/Consumable/Drinks/changelingsting.rsi - type: Icon - sprite: Objects/Drinks/changelingsting.rsi + sprite: Objects/Consumable/Drinks/changelingsting.rsi - type: Item - sprite: Objects/Drinks/changelingsting.rsi + sprite: Objects/Consumable/Drinks/changelingsting.rsi - type: entity parent: DrinkCanBaseFull @@ -146,11 +146,11 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/dr_gibb.rsi + sprite: Objects/Consumable/Drinks/dr_gibb.rsi - type: Icon - sprite: Objects/Drinks/dr_gibb.rsi + sprite: Objects/Consumable/Drinks/dr_gibb.rsi - type: Item - sprite: Objects/Drinks/dr_gibb.rsi + sprite: Objects/Consumable/Drinks/dr_gibb.rsi - type: entity parent: DrinkCanBaseFull @@ -160,8 +160,8 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/energy_drink.rsi + sprite: Objects/Consumable/Drinks/energy_drink.rsi - type: Icon - sprite: Objects/Drinks/energy_drink.rsi + sprite: Objects/Consumable/Drinks/energy_drink.rsi - type: Item - sprite: Objects/Drinks/energy_drink.rsi + sprite: Objects/Consumable/Drinks/energy_drink.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml index 8de5c5613d..a2aa8c8347 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml @@ -26,9 +26,9 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/golden_cup.rsi + sprite: Objects/Consumable/Drinks/golden_cup.rsi - type: Icon - sprite: Objects/Drinks/golden_cup.rsi + sprite: Objects/Consumable/Drinks/golden_cup.rsi - type: entity parent: DrinkBaseCup @@ -39,10 +39,10 @@ - type: Solution maxVol: 15 - type: Sprite - sprite: Objects/Drinks/pitcher.rsi + sprite: Objects/Consumable/Drinks/pitcher.rsi state: icon-6 - type: Icon - sprite: Objects/Drinks/pitcher.rsi + sprite: Objects/Consumable/Drinks/pitcher.rsi state: icon-6 - type: Appearance visuals: @@ -58,10 +58,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug.rsi + sprite: Objects/Consumable/Drinks/mug.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug.rsi + sprite: Objects/Consumable/Drinks/mug.rsi state: icon-3 - type: Appearance visuals: @@ -77,10 +77,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_black.rsi + sprite: Objects/Consumable/Drinks/mug_black.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_black.rsi + sprite: Objects/Consumable/Drinks/mug_black.rsi state: icon-3 - type: Appearance visuals: @@ -96,10 +96,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_blue.rsi + sprite: Objects/Consumable/Drinks/mug_blue.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_blue.rsi + sprite: Objects/Consumable/Drinks/mug_blue.rsi state: icon-3 - type: Appearance visuals: @@ -115,10 +115,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_green.rsi + sprite: Objects/Consumable/Drinks/mug_green.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_green.rsi + sprite: Objects/Consumable/Drinks/mug_green.rsi state: icon-3 - type: Appearance visuals: @@ -134,10 +134,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_heart.rsi + sprite: Objects/Consumable/Drinks/mug_heart.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_heart.rsi + sprite: Objects/Consumable/Drinks/mug_heart.rsi state: icon-3 - type: Appearance visuals: @@ -153,10 +153,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_metal.rsi + sprite: Objects/Consumable/Drinks/mug_metal.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_metal.rsi + sprite: Objects/Consumable/Drinks/mug_metal.rsi state: icon-3 - type: Appearance visuals: @@ -172,10 +172,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_moebius.rsi + sprite: Objects/Consumable/Drinks/mug_moebius.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_moebius.rsi + sprite: Objects/Consumable/Drinks/mug_moebius.rsi state: icon-3 - type: Appearance visuals: @@ -191,10 +191,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_one.rsi + sprite: Objects/Consumable/Drinks/mug_one.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_one.rsi + sprite: Objects/Consumable/Drinks/mug_one.rsi state: icon-3 - type: Appearance visuals: @@ -210,10 +210,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_rainbow.rsi + sprite: Objects/Consumable/Drinks/mug_rainbow.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_rainbow.rsi + sprite: Objects/Consumable/Drinks/mug_rainbow.rsi state: icon-3 - type: Appearance visuals: @@ -229,10 +229,10 @@ - type: Solution maxVol: 10 - type: Sprite - sprite: Objects/Drinks/mug_red.rsi + sprite: Objects/Consumable/Drinks/mug_red.rsi state: icon-3 - type: Icon - sprite: Objects/Drinks/mug_red.rsi + sprite: Objects/Consumable/Drinks/mug_red.rsi state: icon-3 - type: Appearance visuals: @@ -247,9 +247,9 @@ components: - type: Drink - type: Sprite - sprite: Objects/Drinks/hot_coco.rsi + sprite: Objects/Consumable/Drinks/hot_coco.rsi - type: Icon - sprite: Objects/Drinks/hot_coco.rsi + sprite: Objects/Consumable/Drinks/hot_coco.rsi - type: entity parent: DrinkBaseCup @@ -264,9 +264,9 @@ - ReagentId: chem.Coffee Quantity: 20 - type: Sprite - sprite: Objects/Drinks/hot_coffee.rsi + sprite: Objects/Consumable/Drinks/hot_coffee.rsi - type: Icon - sprite: Objects/Drinks/hot_coffee.rsi + sprite: Objects/Consumable/Drinks/hot_coffee.rsi - type: entity parent: DrinkBaseCup @@ -281,10 +281,10 @@ - ReagentId: chem.Tea Quantity: 20 - type: Sprite - sprite: Objects/Drinks/teacup.rsi + sprite: Objects/Consumable/Drinks/teacup.rsi state: icon-1 - type: Icon - sprite: Objects/Drinks/teacup.rsi + sprite: Objects/Consumable/Drinks/teacup.rsi state: icon-1 - type: Appearance visuals: @@ -304,10 +304,10 @@ - ReagentId: chem.Lean Quantity: 20 - type: Sprite - sprite: Objects/Drinks/lean.rsi + sprite: Objects/Consumable/Drinks/lean.rsi state: icon - type: Icon - sprite: Objects/Drinks/lean.rsi + sprite: Objects/Consumable/Drinks/lean.rsi state: icon - type: Item - sprite: Objects/Drinks/lean.rsi + sprite: Objects/Consumable/Drinks/lean.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml index 9b83d13d19..af3c8ade0f 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml @@ -33,11 +33,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/4no_raisins.rsi + sprite: Objects/Consumable/Food/4no_raisins.rsi - type: Icon - sprite: Objects/Food/4no_raisins.rsi + sprite: Objects/Consumable/Food/4no_raisins.rsi - type: Item - sprite: Objects/Food/4no_raisins.rsi + sprite: Objects/Consumable/Food/4no_raisins.rsi - type: entity name: aesir salad @@ -52,9 +52,9 @@ Quantity: 4 trash: TrashSnackBowl - type: Sprite - sprite: Objects/Food/aesirsalad.rsi + sprite: Objects/Consumable/Food/aesirsalad.rsi - type: Icon - sprite: Objects/Food/aesirsalad.rsi + sprite: Objects/Consumable/Food/aesirsalad.rsi - type: entity name: amanita pie @@ -68,9 +68,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/amanita_pie.rsi + sprite: Objects/Consumable/Food/amanita_pie.rsi - type: Icon - sprite: Objects/Food/amanita_pie.rsi + sprite: Objects/Consumable/Food/amanita_pie.rsi - type: entity name: amanita jelly @@ -86,9 +86,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/amanitajelly.rsi + sprite: Objects/Consumable/Food/amanitajelly.rsi - type: Icon - sprite: Objects/Food/amanitajelly.rsi + sprite: Objects/Consumable/Food/amanitajelly.rsi #- type: entity # name: ambrosia vulgar is crushed @@ -100,9 +100,9 @@ # - type: Solution # uses: 1 # - type: Sprite -# sprite: Objects/Food/ambrosiavulgariscrushed.rsi +# sprite: Objects/Consumable/Food/ambrosiavulgariscrushed.rsi # - type: Icon -# sprite: Objects/Food/ambrosiavulgariscrushed.rsi +# sprite: Objects/Consumable/Food/ambrosiavulgariscrushed.rsi - type: entity name: apple cake (slice) @@ -118,9 +118,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/apple_cake_slice.rsi + sprite: Objects/Consumable/Food/apple_cake_slice.rsi - type: Icon - sprite: Objects/Food/apple_cake_slice.rsi + sprite: Objects/Consumable/Food/apple_cake_slice.rsi - type: entity name: apple pie @@ -134,9 +134,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/apple_pie.rsi + sprite: Objects/Consumable/Food/apple_pie.rsi - type: Icon - sprite: Objects/Food/apple_pie.rsi + sprite: Objects/Consumable/Food/apple_pie.rsi # TODO: BREADSLICE? #- type: entity @@ -149,9 +149,9 @@ # - type: Solution # uses: 1 # - type: Sprite -# sprite: Objects/Food/bacon.rsi +# sprite: Objects/Consumable/Food/bacon.rsi # - type: Icon -# sprite: Objects/Food/bacon.rsi +# sprite: Objects/Consumable/Food/bacon.rsi - type: entity name: bad recipe @@ -165,9 +165,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/badrecipe.rsi + sprite: Objects/Consumable/Food/badrecipe.rsi - type: Icon - sprite: Objects/Food/badrecipe.rsi + sprite: Objects/Consumable/Food/badrecipe.rsi - type: entity name: baguette @@ -181,9 +181,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/baguette.rsi + sprite: Objects/Consumable/Food/baguette.rsi - type: Icon - sprite: Objects/Food/baguette.rsi + sprite: Objects/Consumable/Food/baguette.rsi - type: entity name: bread (slice) @@ -199,9 +199,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/breadslice.rsi + sprite: Objects/Consumable/Food/breadslice.rsi - type: Icon - sprite: Objects/Food/breadslice.rsi + sprite: Objects/Consumable/Food/breadslice.rsi - type: entity name: banana bread (slice) @@ -217,9 +217,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/bananabreadslice.rsi + sprite: Objects/Consumable/Food/bananabreadslice.rsi - type: Icon - sprite: Objects/Food/bananabreadslice.rsi + sprite: Objects/Consumable/Food/bananabreadslice.rsi - type: entity parent: FoodBase @@ -235,9 +235,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/pie.rsi + sprite: Objects/Consumable/Food/pie.rsi - type: Icon - sprite: Objects/Food/pie.rsi + sprite: Objects/Consumable/Food/pie.rsi #- type: entity # name: bear meat @@ -249,9 +249,9 @@ # - type: Solution # uses: 1 # - type: Sprite -# sprite: Objects/Food/bearmeat.rsi +# sprite: Objects/Consumable/Food/bearmeat.rsi # - type: Icon -# sprite: Objects/Food/bearmeat.rsi +# sprite: Objects/Consumable/Food/bearmeat.rsi - type: entity name: beet soup @@ -267,9 +267,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/beetsoup.rsi + sprite: Objects/Consumable/Food/beetsoup.rsi - type: Icon - sprite: Objects/Food/beetsoup.rsi + sprite: Objects/Consumable/Food/beetsoup.rsi - type: entity name: berry clafoutis @@ -285,9 +285,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/berryclafoutis.rsi + sprite: Objects/Consumable/Food/berryclafoutis.rsi - type: Icon - sprite: Objects/Food/berryclafoutis.rsi + sprite: Objects/Consumable/Food/berryclafoutis.rsi - type: entity name: birthday cake (slice) @@ -303,9 +303,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/birthday_cake_slice.rsi + sprite: Objects/Consumable/Food/birthday_cake_slice.rsi - type: Icon - sprite: Objects/Food/birthday_cake_slice.rsi + sprite: Objects/Consumable/Food/birthday_cake_slice.rsi - type: entity parent: FoodBase @@ -321,9 +321,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/spaghettiboiled.rsi + sprite: Objects/Consumable/Food/spaghettiboiled.rsi - type: Icon - sprite: Objects/Food/spaghettiboiled.rsi + sprite: Objects/Consumable/Food/spaghettiboiled.rsi - type: entity name: brain cake (slice) @@ -339,9 +339,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/brain_cake_slice.rsi + sprite: Objects/Consumable/Food/brain_cake_slice.rsi - type: Icon - sprite: Objects/Food/brain_cake_slice.rsi + sprite: Objects/Consumable/Food/brain_cake_slice.rsi - type: entity name: candy @@ -357,11 +357,11 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/candy.rsi + sprite: Objects/Consumable/Food/candy.rsi - type: Icon - sprite: Objects/Food/candy.rsi + sprite: Objects/Consumable/Food/candy.rsi - type: Item - sprite: Objects/Food/candy.rsi + sprite: Objects/Consumable/Food/candy.rsi - type: entity name: candy corn @@ -375,9 +375,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/candy_corn.rsi + sprite: Objects/Consumable/Food/candy_corn.rsi - type: Icon - sprite: Objects/Food/candy_corn.rsi + sprite: Objects/Consumable/Food/candy_corn.rsi - type: entity name: carrot cake (slice) @@ -393,9 +393,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/carrotcake_slice.rsi + sprite: Objects/Consumable/Food/carrotcake_slice.rsi - type: Icon - sprite: Objects/Food/carrotcake_slice.rsi + sprite: Objects/Consumable/Food/carrotcake_slice.rsi - type: entity name: carrot fries @@ -411,9 +411,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/carrotfries.rsi + sprite: Objects/Consumable/Food/carrotfries.rsi - type: Icon - sprite: Objects/Food/carrotfries.rsi + sprite: Objects/Consumable/Food/carrotfries.rsi - type: entity name: chawan mushi @@ -429,9 +429,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/chawanmushi.rsi + sprite: Objects/Consumable/Food/chawanmushi.rsi - type: Icon - sprite: Objects/Food/chawanmushi.rsi + sprite: Objects/Consumable/Food/chawanmushi.rsi - type: entity name: cheeseburger @@ -445,11 +445,11 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/cheeseburger.rsi + sprite: Objects/Consumable/Food/cheeseburger.rsi - type: Icon - sprite: Objects/Food/cheeseburger.rsi + sprite: Objects/Consumable/Food/cheeseburger.rsi - type: Item - sprite: Objects/Food/cheeseburger.rsi + sprite: Objects/Consumable/Food/cheeseburger.rsi - type: entity name: cheesecake (slice) @@ -465,9 +465,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/cheesecake_slice.rsi + sprite: Objects/Consumable/Food/cheesecake_slice.rsi - type: Icon - sprite: Objects/Food/cheesecake_slice.rsi + sprite: Objects/Consumable/Food/cheesecake_slice.rsi - type: entity name: cheese wedge @@ -481,9 +481,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/cheesewedge.rsi + sprite: Objects/Consumable/Food/cheesewedge.rsi - type: Icon - sprite: Objects/Food/cheesewedge.rsi + sprite: Objects/Consumable/Food/cheesewedge.rsi - type: entity name: cheesie honkers @@ -499,9 +499,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/cheesie_honkers.rsi + sprite: Objects/Consumable/Food/cheesie_honkers.rsi - type: Icon - sprite: Objects/Food/cheesie_honkers.rsi + sprite: Objects/Consumable/Food/cheesie_honkers.rsi - type: entity name: cheesy fries @@ -517,9 +517,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/cheesyfries.rsi + sprite: Objects/Consumable/Food/cheesyfries.rsi - type: Icon - sprite: Objects/Food/cheesyfries.rsi + sprite: Objects/Consumable/Food/cheesyfries.rsi - type: entity name: cherry pie @@ -533,9 +533,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/cherrypie.rsi + sprite: Objects/Consumable/Food/cherrypie.rsi - type: Icon - sprite: Objects/Food/cherrypie.rsi + sprite: Objects/Consumable/Food/cherrypie.rsi - type: entity name: chips @@ -551,11 +551,11 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/chips.rsi + sprite: Objects/Consumable/Food/chips.rsi - type: Icon - sprite: Objects/Food/chips.rsi + sprite: Objects/Consumable/Food/chips.rsi - type: Item - sprite: Objects/Food/chips.rsi + sprite: Objects/Consumable/Food/chips.rsi - type: entity name: chocolate bar @@ -569,9 +569,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/chocolatebar.rsi + sprite: Objects/Consumable/Food/chocolatebar.rsi - type: Icon - sprite: Objects/Food/chocolatebar.rsi + sprite: Objects/Consumable/Food/chocolatebar.rsi - type: entity name: chocolate cake (slice) @@ -587,9 +587,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/chocolatecake_slice.rsi + sprite: Objects/Consumable/Food/chocolatecake_slice.rsi - type: Icon - sprite: Objects/Food/chocolatecake_slice.rsi + sprite: Objects/Consumable/Food/chocolatecake_slice.rsi - type: entity name: chocolate egg @@ -603,9 +603,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/chocolateegg.rsi + sprite: Objects/Consumable/Food/chocolateegg.rsi - type: Icon - sprite: Objects/Food/chocolateegg.rsi + sprite: Objects/Consumable/Food/chocolateegg.rsi - type: entity name: clown burger @@ -619,11 +619,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/clownburger.rsi + sprite: Objects/Consumable/Food/clownburger.rsi - type: Icon - sprite: Objects/Food/clownburger.rsi + sprite: Objects/Consumable/Food/clownburger.rsi - type: Item - sprite: Objects/Food/clownburger.rsi + sprite: Objects/Consumable/Food/clownburger.rsi - type: entity name: clown's tears @@ -637,9 +637,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/clownstears.rsi + sprite: Objects/Consumable/Food/clownstears.rsi - type: Icon - sprite: Objects/Food/clownstears.rsi + sprite: Objects/Consumable/Food/clownstears.rsi #- type: entity # name: cocoa @@ -652,9 +652,9 @@ # uses: 1 # restore_amount: 3 # - type: Sprite -# sprite: Objects/Food/cocoa.rsi +# sprite: Objects/Consumable/Food/cocoa.rsi # - type: Icon -# sprite: Objects/Food/cocoa.rsi +# sprite: Objects/Consumable/Food/cocoa.rsi - type: entity parent: FoodBase @@ -670,9 +670,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/coldchili.rsi + sprite: Objects/Consumable/Food/coldchili.rsi - type: Icon - sprite: Objects/Food/coldchili.rsi + sprite: Objects/Consumable/Food/coldchili.rsi #- type: entity # parent: FoodBase @@ -685,9 +685,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/coldsauce.rsi +# sprite: Objects/Consumable/Food/coldsauce.rsi # - type: Icon -# sprite: Objects/Food/coldsauce.rsi +# sprite: Objects/Consumable/Food/coldsauce.rsi - type: entity parent: FoodBase @@ -701,9 +701,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/cookie!!!.rsi + sprite: Objects/Consumable/Food/cookie!!!.rsi - type: Icon - sprite: Objects/Food/cookie!!!.rsi + sprite: Objects/Consumable/Food/cookie!!!.rsi - type: entity parent: FoodBase @@ -717,9 +717,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/cracker.rsi + sprite: Objects/Consumable/Food/cracker.rsi - type: Icon - sprite: Objects/Food/cracker.rsi + sprite: Objects/Consumable/Food/cracker.rsi - type: entity parent: FoodBase @@ -735,9 +735,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/creamcheesebreadslice.rsi + sprite: Objects/Consumable/Food/creamcheesebreadslice.rsi - type: Icon - sprite: Objects/Food/creamcheesebreadslice.rsi + sprite: Objects/Consumable/Food/creamcheesebreadslice.rsi - type: entity parent: FoodBase @@ -753,9 +753,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/cubancarp.rsi + sprite: Objects/Consumable/Food/cubancarp.rsi - type: Icon - sprite: Objects/Food/cubancarp.rsi + sprite: Objects/Consumable/Food/cubancarp.rsi #- type: entity # parent: FoodBase @@ -768,9 +768,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/dionaroast.rsi +# sprite: Objects/Consumable/Food/dionaroast.rsi # - type: Icon -# sprite: Objects/Food/dionaroast.rsi +# sprite: Objects/Consumable/Food/dionaroast.rsi - type: entity parent: FoodBase @@ -784,9 +784,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/donkpocket.rsi + sprite: Objects/Consumable/Food/donkpocket.rsi - type: Icon - sprite: Objects/Food/donkpocket.rsi + sprite: Objects/Consumable/Food/donkpocket.rsi - type: entity parent: FoodBase @@ -800,11 +800,11 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/donut1.rsi + sprite: Objects/Consumable/Food/donut1.rsi - type: Icon - sprite: Objects/Food/donut1.rsi + sprite: Objects/Consumable/Food/donut1.rsi - type: Item - sprite: Objects/Food/donut1.rsi + sprite: Objects/Consumable/Food/donut1.rsi - type: entity parent: FoodBase @@ -818,11 +818,11 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/donut2.rsi + sprite: Objects/Consumable/Food/donut2.rsi - type: Icon - sprite: Objects/Food/donut2.rsi + sprite: Objects/Consumable/Food/donut2.rsi - type: Item - sprite: Objects/Food/donut2.rsi + sprite: Objects/Consumable/Food/donut2.rsi.rsi - type: entity parent: FoodBase @@ -836,11 +836,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-blue.rsi + sprite: Objects/Consumable/Food/egg-blue.rsi - type: Icon - sprite: Objects/Food/egg-blue.rsi + sprite: Objects/Consumable/Food/egg-blue.rsi - type: Item - sprite: Objects/Food/egg-blue.rsi + sprite: Objects/Consumable/Food/egg-blue.rsi.rsi - type: entity parent: FoodBase @@ -854,11 +854,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-green.rsi + sprite: Objects/Consumable/Food/egg-green.rsi - type: Icon - sprite: Objects/Food/egg-green.rsi + sprite: Objects/Consumable/Food/egg-green.rsi - type: Item - sprite: Objects/Food/egg-green.rsi + sprite: Objects/Consumable/Food/egg-green.rsi.rsi - type: entity parent: FoodBase @@ -872,11 +872,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-mime.rsi + sprite: Objects/Consumable/Food/egg-mime.rsi - type: Icon - sprite: Objects/Food/egg-mime.rsi + sprite: Objects/Consumable/Food/egg-mime.rsi - type: Item - sprite: Objects/Food/egg-mime.rsi + sprite: Objects/Consumable/Food/egg-mime.rsi.rsi - type: entity parent: FoodBase @@ -890,11 +890,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-orange.rsi + sprite: Objects/Consumable/Food/egg-orange.rsi - type: Icon - sprite: Objects/Food/egg-orange.rsi + sprite: Objects/Consumable/Food/egg-orange.rsi - type: Item - sprite: Objects/Food/egg-orange.rsi + sprite: Objects/Consumable/Food/egg-orange.rsi.rsi - type: entity parent: FoodBase @@ -908,11 +908,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-purple.rsi + sprite: Objects/Consumable/Food/egg-purple.rsi - type: Icon - sprite: Objects/Food/egg-purple.rsi + sprite: Objects/Consumable/Food/egg-purple.rsi - type: Item - sprite: Objects/Food/egg-purple.rsi + sprite: Objects/Consumable/Food/egg-purple.rsi.rsi - type: entity parent: FoodBase @@ -926,11 +926,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-rainbow.rsi + sprite: Objects/Consumable/Food/egg-rainbow.rsi - type: Icon - sprite: Objects/Food/egg-rainbow.rsi + sprite: Objects/Consumable/Food/egg-rainbow.rsi - type: Item - sprite: Objects/Food/egg-rainbow.rsi + sprite: Objects/Consumable/Food/egg-rainbow.rsi.rsi - type: entity parent: FoodBase @@ -944,11 +944,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-red.rsi + sprite: Objects/Consumable/Food/egg-red.rsi - type: Icon - sprite: Objects/Food/egg-red.rsi + sprite: Objects/Consumable/Food/egg-red.rsi - type: Item - sprite: Objects/Food/egg-red.rsi + sprite: Objects/Consumable/Food/egg-red.rsi.rsi - type: entity @@ -963,11 +963,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg-yellow.rsi + sprite: Objects/Consumable/Food/egg-yellow.rsi - type: Icon - sprite: Objects/Food/egg-yellow.rsi + sprite: Objects/Consumable/Food/egg-yellow.rsi - type: Item - sprite: Objects/Food/egg-yellow.rsi + sprite: Objects/Consumable/Food/egg-yellow.rsi - type: entity parent: FoodBase @@ -981,11 +981,11 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/egg.rsi + sprite: Objects/Consumable/Food/egg.rsi - type: Icon - sprite: Objects/Food/egg.rsi + sprite: Objects/Consumable/Food/egg.rsi - type: Item - sprite: Objects/Food/egg.rsi + sprite: Objects/Consumable/Food/egg.rsi - type: entity parent: FoodBase @@ -1001,9 +1001,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/eggplantparm.rsi + sprite: Objects/Consumable/Food/eggplantparm.rsi - type: Icon - sprite: Objects/Food/eggplantparm.rsi + sprite: Objects/Consumable/Food/eggplantparm.rsi #- type: entity # parent: FoodBase @@ -1016,9 +1016,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/emptycondiment.rsi +# sprite: Objects/Consumable/Food/emptycondiment.rsi # - type: Icon -# sprite: Objects/Food/emptycondiment.rsi +# sprite: Objects/Consumable/Food/emptycondiment.rsi - type: entity parent: FoodBase @@ -1034,9 +1034,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/enchiladas.rsi + sprite: Objects/Consumable/Food/enchiladas.rsi - type: Icon - sprite: Objects/Food/enchiladas.rsi + sprite: Objects/Consumable/Food/enchiladas.rsi #- type: entity # parent: FoodBase @@ -1049,9 +1049,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/enchiladasold.rsi +# sprite: Objects/Consumable/Food/enchiladasold.rsi # - type: Icon -# sprite: Objects/Food/enchiladasold.rsi +# sprite: Objects/Consumable/Food/enchiladasold.rsi #- type: entity # parent: FoodBase @@ -1064,9 +1064,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/enzyme.rsi +# sprite: Objects/Consumable/Food/enzyme.rsi # - type: Icon -# sprite: Objects/Food/enzyme.rsi +# sprite: Objects/Consumable/Food/enzyme.rsi - type: entity parent: FoodBase @@ -1080,9 +1080,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/fishandchips.rsi + sprite: Objects/Consumable/Food/fishandchips.rsi - type: Icon - sprite: Objects/Food/fishandchips.rsi + sprite: Objects/Consumable/Food/fishandchips.rsi - type: entity parent: FoodBase @@ -1096,11 +1096,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/fishburger.rsi + sprite: Objects/Consumable/Food/fishburger.rsi - type: Icon - sprite: Objects/Food/fishburger.rsi + sprite: Objects/Consumable/Food/fishburger.rsi - type: Item - sprite: Objects/Food/fishburger.rsi + sprite: Objects/Consumable/Food/fishburger.rsi #- type: entity # parent: FoodBase @@ -1113,9 +1113,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/fishfillet.rsi +# sprite: Objects/Consumable/Food/fishfillet.rsi # - type: Icon -# sprite: Objects/Food/fishfillet.rsi +# sprite: Objects/Consumable/Food/fishfillet.rsi - type: entity parent: FoodBase @@ -1129,9 +1129,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/fishfingers.rsi + sprite: Objects/Consumable/Food/fishfingers.rsi - type: Icon - sprite: Objects/Food/fishfingers.rsi + sprite: Objects/Consumable/Food/fishfingers.rsi #- type: entity # parent: FoodBase @@ -1144,9 +1144,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/flour.rsi +# sprite: Objects/Consumable/Food/flour.rsi # - type: Icon -# sprite: Objects/Food/flour.rsi +# sprite: Objects/Consumable/Food/flour.rsi - type: entity parent: FoodBase @@ -1160,9 +1160,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/fortune_cookie.rsi + sprite: Objects/Consumable/Food/fortune_cookie.rsi - type: Icon - sprite: Objects/Food/fortune_cookie.rsi + sprite: Objects/Consumable/Food/fortune_cookie.rsi - type: entity parent: FoodBase @@ -1176,9 +1176,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/friedegg.rsi + sprite: Objects/Consumable/Food/friedegg.rsi - type: Icon - sprite: Objects/Food/friedegg.rsi + sprite: Objects/Consumable/Food/friedegg.rsi - type: entity parent: FoodBase @@ -1194,9 +1194,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/fries.rsi + sprite: Objects/Consumable/Food/fries.rsi - type: Icon - sprite: Objects/Food/fries.rsi + sprite: Objects/Consumable/Food/fries.rsi - type: entity parent: FoodBase @@ -1212,9 +1212,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/gappletart.rsi + sprite: Objects/Consumable/Food/gappletart.rsi - type: Icon - sprite: Objects/Food/gappletart.rsi + sprite: Objects/Consumable/Food/gappletart.rsi - type: entity parent: FoodBase @@ -1230,9 +1230,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/toastedsandwich.rsi + sprite: Objects/Consumable/Food/toastedsandwich.rsi - type: Icon - sprite: Objects/Food/toastedsandwich.rsi + sprite: Objects/Consumable/Food/toastedsandwich.rsi - type: entity parent: FoodBase @@ -1246,11 +1246,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: Icon - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: Item - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: entity parent: FoodBase @@ -1266,9 +1266,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/herbsalad.rsi + sprite: Objects/Consumable/Food/herbsalad.rsi - type: Icon - sprite: Objects/Food/herbsalad.rsi + sprite: Objects/Consumable/Food/herbsalad.rsi #- type: entity # parent: FoodBase @@ -1281,9 +1281,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/honeycomb.rsi +# sprite: Objects/Consumable/Food/honeycomb.rsi # - type: Icon -# sprite: Objects/Food/honeycomb.rsi +# sprite: Objects/Consumable/Food/honeycomb.rsi - type: entity parent: FoodBase @@ -1299,9 +1299,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/hotchili.rsi + sprite: Objects/Consumable/Food/hotchili.rsi - type: Icon - sprite: Objects/Food/hotchili.rsi + sprite: Objects/Consumable/Food/hotchili.rsi - type: entity parent: FoodBase @@ -1315,9 +1315,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/hotdog.rsi + sprite: Objects/Consumable/Food/hotdog.rsi - type: Icon - sprite: Objects/Food/hotdog.rsi + sprite: Objects/Consumable/Food/hotdog.rsi #- type: entity # parent: FoodBase @@ -1330,9 +1330,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/hotsauce.rsi +# sprite: Objects/Consumable/Food/hotsauce.rsi # - type: Icon -# sprite: Objects/Food/hotsauce.rsi +# sprite: Objects/Consumable/Food/hotsauce.rsi - type: entity parent: FoodBase @@ -1346,9 +1346,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/hugemushroomslice.rsi + sprite: Objects/Consumable/Food/hugemushroomslice.rsi - type: Icon - sprite: Objects/Food/hugemushroomslice.rsi + sprite: Objects/Consumable/Food/hugemushroomslice.rsi - type: entity parent: FoodBase @@ -1364,9 +1364,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi - type: Icon - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi - type: entity parent: FoodBase @@ -1380,9 +1380,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/jdonut1.rsi + sprite: Objects/Consumable/Food/jdonut1.rsi - type: Icon - sprite: Objects/Food/jdonut1.rsi + sprite: Objects/Consumable/Food/jdonut1.rsi - type: entity parent: FoodBase @@ -1396,9 +1396,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/jdonut2.rsi + sprite: Objects/Consumable/Food/jdonut2.rsi - type: Icon - sprite: Objects/Food/jdonut2.rsi + sprite: Objects/Consumable/Food/jdonut2.rsi - type: entity parent: FoodBase @@ -1412,11 +1412,11 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/jellyburger.rsi + sprite: Objects/Consumable/Food/jellyburger.rsi - type: Icon - sprite: Objects/Food/jellyburger.rsi + sprite: Objects/Consumable/Food/jellyburger.rsi - type: Item - sprite: Objects/Food/jellyburger.rsi + sprite: Objects/Consumable/Food/jellyburger.rsi - type: entity parent: FoodBase @@ -1432,9 +1432,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/jellysandwich.rsi + sprite: Objects/Consumable/Food/jellysandwich.rsi - type: Icon - sprite: Objects/Food/jellysandwich.rsi + sprite: Objects/Consumable/Food/jellysandwich.rsi - type: entity parent: FoodBase @@ -1450,9 +1450,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/jellytoast.rsi + sprite: Objects/Consumable/Food/jellytoast.rsi - type: Icon - sprite: Objects/Food/jellytoast.rsi + sprite: Objects/Consumable/Food/jellytoast.rsi # TODO: Add more pies. Anything that shares a sprite - type: entity @@ -1469,9 +1469,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi - type: Icon - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi #- type: entity # parent: FoodBase @@ -1484,9 +1484,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/ketchup.rsi +# sprite: Objects/Consumable/Food/ketchup.rsi # - type: Icon -# sprite: Objects/Food/ketchup.rsi +# sprite: Objects/Consumable/Food/ketchup.rsi #- type: entity # parent: FoodBase @@ -1499,9 +1499,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/ketchupold.rsi +# sprite: Objects/Consumable/Food/ketchupold.rsi # - type: Icon -# sprite: Objects/Food/ketchupold.rsi +# sprite: Objects/Consumable/Food/ketchupold.rsi - type: entity parent: FoodBase @@ -1517,9 +1517,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/lemoncake_slice.rsi + sprite: Objects/Consumable/Food/lemoncake_slice.rsi - type: Icon - sprite: Objects/Food/lemoncake_slice.rsi + sprite: Objects/Consumable/Food/lemoncake_slice.rsi - type: entity parent: FoodBase @@ -1535,9 +1535,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/limecake_slice.rsi + sprite: Objects/Consumable/Food/limecake_slice.rsi - type: Icon - sprite: Objects/Food/limecake_slice.rsi + sprite: Objects/Consumable/Food/limecake_slice.rsi - type: entity parent: FoodBase @@ -1551,9 +1551,9 @@ - ReagentId: chem.Nutriment Quantity: 40 - type: Sprite - sprite: Objects/Food/liquidfood.rsi + sprite: Objects/Consumable/Food/liquidfood.rsi - type: Icon - sprite: Objects/Food/liquidfood.rsi + sprite: Objects/Consumable/Food/liquidfood.rsi - type: entity parent: FoodBase @@ -1567,9 +1567,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/loadedbakedpotato.rsi + sprite: Objects/Consumable/Food/loadedbakedpotato.rsi - type: Icon - sprite: Objects/Food/loadedbakedpotato.rsi + sprite: Objects/Consumable/Food/loadedbakedpotato.rsi - type: entity parent: FoodBase @@ -1583,9 +1583,9 @@ - ReagentId: chem.Nutriment Quantity: 5 - type: Sprite - sprite: Objects/Food/meat.rsi + sprite: Objects/Consumable/Food/meat.rsi - type: Icon - sprite: Objects/Food/meat.rsi + sprite: Objects/Consumable/Food/meat.rsi - type: entity parent: FoodBase @@ -1599,11 +1599,11 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/meatball.rsi + sprite: Objects/Consumable/Food/meatball.rsi - type: Icon - sprite: Objects/Food/meatball.rsi + sprite: Objects/Consumable/Food/meatball.rsi - type: Item - sprite: Objects/Food/meatball.rsi + sprite: Objects/Consumable/Food/meatball.rsi - type: entity parent: FoodBase @@ -1619,9 +1619,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/meatballsoup.rsi + sprite: Objects/Consumable/Food/meatballsoup.rsi - type: Icon - sprite: Objects/Food/meatballsoup.rsi + sprite: Objects/Consumable/Food/meatballsoup.rsi - type: entity parent: FoodBase @@ -1637,9 +1637,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/meatballspaghetti.rsi + sprite: Objects/Consumable/Food/meatballspaghetti.rsi - type: Icon - sprite: Objects/Food/meatballspaghetti.rsi + sprite: Objects/Consumable/Food/meatballspaghetti.rsi - type: entity parent: FoodBase @@ -1655,9 +1655,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/meatbreadslice.rsi + sprite: Objects/Consumable/Food/meatbreadslice.rsi - type: Icon - sprite: Objects/Food/meatbreadslice.rsi + sprite: Objects/Consumable/Food/meatbreadslice.rsi - type: entity parent: FoodBase @@ -1673,9 +1673,9 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/meatpie.rsi + sprite: Objects/Consumable/Food/meatpie.rsi - type: Icon - sprite: Objects/Food/meatpie.rsi + sprite: Objects/Consumable/Food/meatpie.rsi - type: entity parent: FoodBase @@ -1689,9 +1689,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/meatpizzaslice.rsi + sprite: Objects/Consumable/Food/meatpizzaslice.rsi - type: Icon - sprite: Objects/Food/meatpizzaslice.rsi + sprite: Objects/Consumable/Food/meatpizzaslice.rsi - type: entity parent: FoodBase @@ -1707,9 +1707,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/meatsteak.rsi + sprite: Objects/Consumable/Food/meatsteak.rsi - type: Icon - sprite: Objects/Food/meatsteak.rsi + sprite: Objects/Consumable/Food/meatsteak.rsi - type: entity parent: FoodBase @@ -1725,9 +1725,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/milosoup.rsi + sprite: Objects/Consumable/Food/milosoup.rsi - type: Icon - sprite: Objects/Food/milosoup.rsi + sprite: Objects/Consumable/Food/milosoup.rsi - type: entity parent: FoodBase @@ -1741,9 +1741,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/mimeburger.rsi + sprite: Objects/Consumable/Food/mimeburger.rsi - type: Icon - sprite: Objects/Food/mimeburger.rsi + sprite: Objects/Consumable/Food/mimeburger.rsi - type: entity parent: FoodBase @@ -1757,9 +1757,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/mint.rsi + sprite: Objects/Consumable/Food/mint.rsi - type: Icon - sprite: Objects/Food/mint.rsi + sprite: Objects/Consumable/Food/mint.rsi #- type: entity # parent: FoodBase @@ -1772,9 +1772,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/mixedcondiments.rsi +# sprite: Objects/Consumable/Food/mixedcondiments.rsi # - type: Icon -# sprite: Objects/Food/mixedcondiments.rsi +# sprite: Objects/Consumable/Food/mixedcondiments.rsi - type: entity parent: FoodBase @@ -1788,11 +1788,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: Icon - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: Item - sprite: Objects/Food/hburger.rsi + sprite: Objects/Consumable/Food/hburger.rsi - type: entity parent: FoodBase @@ -1806,9 +1806,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/monkeycube.rsi + sprite: Objects/Consumable/Food/monkeycube.rsi - type: Icon - sprite: Objects/Food/monkeycube.rsi + sprite: Objects/Consumable/Food/monkeycube.rsi - type: entity parent: FoodBase @@ -1824,9 +1824,9 @@ - ReagentId: chem.Nutriment Quantity: 30 - type: Sprite - sprite: Objects/Food/monkeysdelight.rsi + sprite: Objects/Consumable/Food/monkeysdelight.rsi - type: Icon - sprite: Objects/Food/monkeysdelight.rsi + sprite: Objects/Consumable/Food/monkeysdelight.rsi #- type: entity # parent: FoodBase @@ -1839,9 +1839,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/mtearp.rsi +# sprite: Objects/Consumable/Food/mtearp.rsi # - type: Icon -# sprite: Objects/Food/mtearp.rsi +# sprite: Objects/Consumable/Food/mtearp.rsi #- type: entity # parent: FoodBase @@ -1854,9 +1854,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/muffin.rsi +# sprite: Objects/Consumable/Food/muffin.rsi # - type: Icon -# sprite: Objects/Food/muffin.rsi +# sprite: Objects/Consumable/Food/muffin.rsi - type: entity parent: FoodBase @@ -1870,9 +1870,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/mushroompizzaslice.rsi + sprite: Objects/Consumable/Food/mushroompizzaslice.rsi - type: Icon - sprite: Objects/Food/mushroompizzaslice.rsi + sprite: Objects/Consumable/Food/mushroompizzaslice.rsi - type: entity parent: FoodBase @@ -1888,9 +1888,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/mushroomsoup.rsi + sprite: Objects/Consumable/Food/mushroomsoup.rsi - type: Icon - sprite: Objects/Food/mushroomsoup.rsi + sprite: Objects/Consumable/Food/mushroomsoup.rsi # TODO: More in this one - type: entity @@ -1907,9 +1907,9 @@ - ReagentId: chem.Nutriment Quantity: 1 - type: Sprite - sprite: Objects/Food/mysterysoup.rsi + sprite: Objects/Consumable/Food/mysterysoup.rsi - type: Icon - sprite: Objects/Food/mysterysoup.rsi + sprite: Objects/Consumable/Food/mysterysoup.rsi - type: entity parent: FoodBase @@ -1925,9 +1925,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/nettlesoup.rsi + sprite: Objects/Consumable/Food/nettlesoup.rsi - type: Icon - sprite: Objects/Food/nettlesoup.rsi + sprite: Objects/Consumable/Food/nettlesoup.rsi #- type: entity # parent: FoodBase @@ -1940,9 +1940,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/oliveoil.rsi +# sprite: Objects/Consumable/Food/oliveoil.rsi # - type: Icon -# sprite: Objects/Food/oliveoil.rsi +# sprite: Objects/Consumable/Food/oliveoil.rsi - type: entity parent: FoodBase @@ -1958,9 +1958,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/omelette.rsi + sprite: Objects/Consumable/Food/omelette.rsi - type: Icon - sprite: Objects/Food/omelette.rsi + sprite: Objects/Consumable/Food/omelette.rsi - type: entity parent: FoodBase @@ -1976,9 +1976,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/orangecake_slice.rsi + sprite: Objects/Consumable/Food/orangecake_slice.rsi - type: Icon - sprite: Objects/Food/orangecake_slice.rsi + sprite: Objects/Consumable/Food/orangecake_slice.rsi - type: entity parent: FoodBase @@ -1994,9 +1994,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/pastatomato.rsi + sprite: Objects/Consumable/Food/pastatomato.rsi - type: Icon - sprite: Objects/Food/pastatomato.rsi + sprite: Objects/Consumable/Food/pastatomato.rsi #- type: entity # parent: FoodBase @@ -2009,9 +2009,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/peppermillsmall.rsi +# sprite: Objects/Consumable/Food/peppermillsmall.rsi # - type: Icon -# sprite: Objects/Food/peppermillsmall.rsi +# sprite: Objects/Consumable/Food/peppermillsmall.rsi - type: entity parent: FoodBase @@ -2025,9 +2025,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/phelmbiscuit.rsi + sprite: Objects/Consumable/Food/phelmbiscuit.rsi - type: Icon - sprite: Objects/Food/phelmbiscuit.rsi + sprite: Objects/Consumable/Food/phelmbiscuit.rsi - type: entity parent: FoodBase @@ -2041,9 +2041,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/pizzamargheritaslice.rsi + sprite: Objects/Consumable/Food/pizzamargheritaslice.rsi - type: Icon - sprite: Objects/Food/pizzamargheritaslice.rsi + sprite: Objects/Consumable/Food/pizzamargheritaslice.rsi - type: entity parent: FoodBase @@ -2059,9 +2059,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/plaincake_slice.rsi + sprite: Objects/Consumable/Food/plaincake_slice.rsi - type: Icon - sprite: Objects/Food/plaincake_slice.rsi + sprite: Objects/Consumable/Food/plaincake_slice.rsi - type: entity parent: FoodBase @@ -2075,9 +2075,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/plump_pie.rsi + sprite: Objects/Consumable/Food/plump_pie.rsi - type: Icon - sprite: Objects/Food/plump_pie.rsi + sprite: Objects/Consumable/Food/plump_pie.rsi - type: entity parent: FoodBase @@ -2094,9 +2094,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/popcorn.rsi + sprite: Objects/Consumable/Food/popcorn.rsi - type: Icon - sprite: Objects/Food/popcorn.rsi + sprite: Objects/Consumable/Food/popcorn.rsi - type: entity parent: FoodBase @@ -2110,9 +2110,9 @@ - ReagentId: chem.Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Food/poppypretzel.rsi + sprite: Objects/Consumable/Food/poppypretzel.rsi - type: Icon - sprite: Objects/Food/poppypretzel.rsi + sprite: Objects/Consumable/Food/poppypretzel.rsi - type: entity parent: FoodBase @@ -2128,9 +2128,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/pumpkinpieslice.rsi + sprite: Objects/Consumable/Food/pumpkinpieslice.rsi - type: Icon - sprite: Objects/Food/pumpkinpieslice.rsi + sprite: Objects/Consumable/Food/pumpkinpieslice.rsi # TODO: Boiled rice? #- type: entity @@ -2144,9 +2144,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/rice.rsi +# sprite: Objects/Consumable/Food/rice.rsi # - type: Icon -# sprite: Objects/Food/rice.rsi +# sprite: Objects/Consumable/Food/rice.rsi - type: entity parent: FoodBase @@ -2160,9 +2160,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/roburger.rsi + sprite: Objects/Consumable/Food/roburger.rsi - type: Icon - sprite: Objects/Food/roburger.rsi + sprite: Objects/Consumable/Food/roburger.rsi - type: entity parent: FoodBase @@ -2178,9 +2178,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/rofflewaffles.rsi + sprite: Objects/Consumable/Food/rofflewaffles.rsi - type: Icon - sprite: Objects/Food/rofflewaffles.rsi + sprite: Objects/Consumable/Food/rofflewaffles.rsi #- type: entity # parent: FoodBase @@ -2193,9 +2193,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/rorosoup.rsi +# sprite: Objects/Consumable/Food/rorosoup.rsi # - type: Icon -# sprite: Objects/Food/rorosoup.rsi +# sprite: Objects/Consumable/Food/rorosoup.rsi #- type: entity # parent: FoodBase @@ -2208,9 +2208,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/rottenmeat.rsi +# sprite: Objects/Consumable/Food/rottenmeat.rsi # - type: Icon -# sprite: Objects/Food/rottenmeat.rsi +# sprite: Objects/Consumable/Food/rottenmeat.rsi - type: entity parent: FoodBase @@ -2226,9 +2226,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/rpudding.rsi + sprite: Objects/Consumable/Food/rpudding.rsi - type: Icon - sprite: Objects/Food/rpudding.rsi + sprite: Objects/Consumable/Food/rpudding.rsi - type: entity parent: FoodBase @@ -2244,9 +2244,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/sandwich.rsi + sprite: Objects/Consumable/Food/sandwich.rsi - type: Icon - sprite: Objects/Food/sandwich.rsi + sprite: Objects/Consumable/Food/sandwich.rsi #- type: entity # parent: FoodBase @@ -2259,9 +2259,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/sandwich_filling.rsi +# sprite: Objects/Consumable/Food/sandwich_filling.rsi # - type: Icon -# sprite: Objects/Food/sandwich_filling.rsi +# sprite: Objects/Consumable/Food/sandwich_filling.rsi #- type: entity # parent: FoodBase @@ -2274,9 +2274,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/sandwich_top.rsi +# sprite: Objects/Consumable/Food/sandwich_top.rsi # - type: Icon -# sprite: Objects/Food/sandwich_top.rsi +# sprite: Objects/Consumable/Food/sandwich_top.rsi - type: entity parent: FoodBase @@ -2290,9 +2290,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/sausage.rsi + sprite: Objects/Consumable/Food/sausage.rsi - type: Icon - sprite: Objects/Food/sausage.rsi + sprite: Objects/Consumable/Food/sausage.rsi #- type: entity # parent: FoodBase @@ -2305,9 +2305,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/shandp.rsi +# sprite: Objects/Consumable/Food/shandp.rsi # - type: Icon -# sprite: Objects/Food/shandp.rsi +# sprite: Objects/Consumable/Food/shandp.rsi #- type: entity # parent: FoodBase @@ -2320,9 +2320,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/skrellsnacks.rsi +# sprite: Objects/Consumable/Food/skrellsnacks.rsi # - type: Icon -# sprite: Objects/Food/skrellsnacks.rsi +# sprite: Objects/Consumable/Food/skrellsnacks.rsi - type: entity parent: FoodBase @@ -2337,11 +2337,11 @@ Quantity: 4 trash: TrashSOSJerky - type: Sprite - sprite: Objects/Food/sosjerky.rsi + sprite: Objects/Consumable/Food/sosjerky.rsi - type: Icon - sprite: Objects/Food/sosjerky.rsi + sprite: Objects/Consumable/Food/sosjerky.rsi - type: Item - sprite: Objects/Food/sosjerky.rsi + sprite: Objects/Consumable/Food/sosjerky.rsi - type: entity parent: FoodBase @@ -2357,9 +2357,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/soydope.rsi + sprite: Objects/Consumable/Food/soydope.rsi - type: Icon - sprite: Objects/Food/soydope.rsi + sprite: Objects/Consumable/Food/soydope.rsi - type: entity parent: FoodBase @@ -2375,9 +2375,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/soylent_green.rsi + sprite: Objects/Consumable/Food/soylent_green.rsi - type: Icon - sprite: Objects/Food/soylent_green.rsi + sprite: Objects/Consumable/Food/soylent_green.rsi # why these were named different i have no idea - type: entity @@ -2394,9 +2394,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/soylent_yellow.rsi + sprite: Objects/Consumable/Food/soylent_yellow.rsi - type: Icon - sprite: Objects/Food/soylent_yellow.rsi + sprite: Objects/Consumable/Food/soylent_yellow.rsi #- type: entity # parent: FoodBase @@ -2409,9 +2409,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/soysauce.rsi +# sprite: Objects/Consumable/Food/soysauce.rsi # - type: Icon -# sprite: Objects/Food/soysauce.rsi +# sprite: Objects/Consumable/Food/soysauce.rsi - type: entity parent: FoodBase @@ -2425,9 +2425,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/space_twinkie.rsi + sprite: Objects/Consumable/Food/space_twinkie.rsi - type: Icon - sprite: Objects/Food/space_twinkie.rsi + sprite: Objects/Consumable/Food/space_twinkie.rsi - type: entity parent: FoodBase @@ -2443,9 +2443,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/spacylibertyduff.rsi + sprite: Objects/Consumable/Food/spacylibertyduff.rsi - type: Icon - sprite: Objects/Food/spacylibertyduff.rsi + sprite: Objects/Consumable/Food/spacylibertyduff.rsi - type: entity parent: FoodBase @@ -2459,9 +2459,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/spaghetti.rsi + sprite: Objects/Consumable/Food/spaghetti.rsi - type: Icon - sprite: Objects/Food/spaghetti.rsi + sprite: Objects/Consumable/Food/spaghetti.rsi - type: entity parent: FoodBase @@ -2475,11 +2475,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/spellburger.rsi + sprite: Objects/Consumable/Food/spellburger.rsi - type: Icon - sprite: Objects/Food/spellburger.rsi + sprite: Objects/Consumable/Food/spellburger.rsi - type: Item - sprite: Objects/Food/spellburger.rsi + sprite: Objects/Consumable/Food/spellburger.rsi - type: entity parent: FoodBase @@ -2493,9 +2493,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/spesslaw.rsi + sprite: Objects/Consumable/Food/spesslaw.rsi - type: Icon - sprite: Objects/Food/spesslaw.rsi + sprite: Objects/Consumable/Food/spesslaw.rsi - type: entity parent: FoodBase @@ -2509,9 +2509,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/stew.rsi + sprite: Objects/Consumable/Food/stew.rsi - type: Icon - sprite: Objects/Food/stew.rsi + sprite: Objects/Consumable/Food/stew.rsi - type: entity parent: FoodBase @@ -2527,9 +2527,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/stewedsoymeat.rsi + sprite: Objects/Consumable/Food/stewedsoymeat.rsi - type: Icon - sprite: Objects/Food/stewedsoymeat.rsi + sprite: Objects/Consumable/Food/stewedsoymeat.rsi - type: entity parent: FoodBase @@ -2543,9 +2543,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/stuffing.rsi + sprite: Objects/Consumable/Food/stuffing.rsi - type: Icon - sprite: Objects/Food/stuffing.rsi + sprite: Objects/Consumable/Food/stuffing.rsi #- type: entity # parent: FoodBase @@ -2558,9 +2558,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/sugar.rsi +# sprite: Objects/Consumable/Food/sugar.rsi # - type: Icon -# sprite: Objects/Food/sugar.rsi +# sprite: Objects/Consumable/Food/sugar.rsi #- type: entity # parent: FoodBase @@ -2573,9 +2573,9 @@ # uses: 1 # restore_amount: 1 # - type: Sprite -# sprite: Objects/Food/sugarsmall.rsi +# sprite: Objects/Consumable/Food/sugarsmall.rsi # - type: Icon -# sprite: Objects/Food/sugarsmall.rsi +# sprite: Objects/Consumable/Food/sugarsmall.rsi - type: entity parent: FoodBase @@ -2589,9 +2589,9 @@ - ReagentId: chem.Nutriment Quantity: 40 - type: Sprite - sprite: Objects/Food/superbiteburger.rsi + sprite: Objects/Consumable/Food/superbiteburger.rsi - type: Icon - sprite: Objects/Food/superbiteburger.rsi + sprite: Objects/Consumable/Food/superbiteburger.rsi - type: entity parent: FoodBase @@ -2607,9 +2607,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/syndi_cakes.rsi + sprite: Objects/Consumable/Food/syndi_cakes.rsi - type: Icon - sprite: Objects/Food/syndi_cakes.rsi + sprite: Objects/Consumable/Food/syndi_cakes.rsi - type: entity parent: FoodBase @@ -2623,9 +2623,9 @@ - ReagentId: chem.Nutriment Quantity: 8 - type: Sprite - sprite: Objects/Food/taco.rsi + sprite: Objects/Consumable/Food/taco.rsi - type: Icon - sprite: Objects/Food/taco.rsi + sprite: Objects/Consumable/Food/taco.rsi - type: entity parent: FoodBase @@ -2641,9 +2641,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/tastybread.rsi + sprite: Objects/Consumable/Food/tastybread.rsi - type: Icon - sprite: Objects/Food/tastybread.rsi + sprite: Objects/Consumable/Food/tastybread.rsi - type: entity parent: FoodBase @@ -2659,9 +2659,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/toastedsandwich.rsi + sprite: Objects/Consumable/Food/toastedsandwich.rsi - type: Icon - sprite: Objects/Food/toastedsandwich.rsi + sprite: Objects/Consumable/Food/toastedsandwich.rsi - type: entity parent: FoodBase @@ -2675,9 +2675,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/tofu.rsi + sprite: Objects/Consumable/Food/tofu.rsi - type: Icon - sprite: Objects/Food/tofu.rsi + sprite: Objects/Consumable/Food/tofu.rsi - type: entity parent: FoodBase @@ -2693,9 +2693,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/tofubreadslice.rsi + sprite: Objects/Consumable/Food/tofubreadslice.rsi - type: Icon - sprite: Objects/Food/tofubreadslice.rsi + sprite: Objects/Consumable/Food/tofubreadslice.rsi - type: entity parent: FoodBase @@ -2709,11 +2709,11 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/tofuburger.rsi + sprite: Objects/Consumable/Food/tofuburger.rsi - type: Icon - sprite: Objects/Food/tofuburger.rsi + sprite: Objects/Consumable/Food/tofuburger.rsi - type: Item - sprite: Objects/Food/tofuburger.rsi + sprite: Objects/Consumable/Food/tofuburger.rsi - type: entity parent: FoodBase @@ -2729,9 +2729,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi - type: Icon - sprite: Objects/Food/kabob.rsi + sprite: Objects/Consumable/Food/kabob.rsi - type: entity parent: FoodBase @@ -2745,9 +2745,9 @@ - ReagentId: chem.Nutriment Quantity: 24 - type: Sprite - sprite: Objects/Food/tofurkey.rsi + sprite: Objects/Consumable/Food/tofurkey.rsi - type: Icon - sprite: Objects/Food/tofurkey.rsi + sprite: Objects/Consumable/Food/tofurkey.rsi - type: entity parent: FoodBase @@ -2761,9 +2761,9 @@ - ReagentId: chem.Nutriment Quantity: 6 - type: Sprite - sprite: Objects/Food/tomatomeat.rsi + sprite: Objects/Consumable/Food/tomatomeat.rsi - type: Icon - sprite: Objects/Food/tomatomeat.rsi + sprite: Objects/Consumable/Food/tomatomeat.rsi - type: entity parent: FoodBase @@ -2779,9 +2779,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/tomatosoup.rsi + sprite: Objects/Consumable/Food/tomatosoup.rsi - type: Icon - sprite: Objects/Food/tomatosoup.rsi + sprite: Objects/Consumable/Food/tomatosoup.rsi - type: entity parent: FoodBase @@ -2795,9 +2795,9 @@ - ReagentId: chem.Nutriment Quantity: 4 - type: Sprite - sprite: Objects/Food/twobread.rsi + sprite: Objects/Consumable/Food/twobread.rsi - type: Icon - sprite: Objects/Food/twobread.rsi + sprite: Objects/Consumable/Food/twobread.rsi - type: entity parent: FoodBase @@ -2813,9 +2813,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/validsalad.rsi + sprite: Objects/Consumable/Food/validsalad.rsi - type: Icon - sprite: Objects/Food/validsalad.rsi + sprite: Objects/Consumable/Food/validsalad.rsi - type: entity parent: FoodBase @@ -2829,9 +2829,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/vegetablepizzaslice.rsi + sprite: Objects/Consumable/Food/vegetablepizzaslice.rsi - type: Icon - sprite: Objects/Food/vegetablepizzaslice.rsi + sprite: Objects/Consumable/Food/vegetablepizzaslice.rsi - type: entity parent: FoodBase @@ -2847,9 +2847,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/vegetablesoup.rsi + sprite: Objects/Consumable/Food/vegetablesoup.rsi - type: Icon - sprite: Objects/Food/vegetablesoup.rsi + sprite: Objects/Consumable/Food/vegetablesoup.rsi - type: entity parent: FoodBase @@ -2865,9 +2865,9 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/waffles.rsi + sprite: Objects/Consumable/Food/waffles.rsi - type: Icon - sprite: Objects/Food/waffles.rsi + sprite: Objects/Consumable/Food/waffles.rsi - type: entity parent: FoodBase @@ -2881,9 +2881,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/watermelonslice.rsi + sprite: Objects/Consumable/Food/watermelonslice.rsi - type: Icon - sprite: Objects/Food/watermelonslice.rsi + sprite: Objects/Consumable/Food/watermelonslice.rsi - type: entity parent: FoodBase @@ -2899,9 +2899,9 @@ - ReagentId: chem.Nutriment Quantity: 12 - type: Sprite - sprite: Objects/Food/wingfangchu.rsi + sprite: Objects/Consumable/Food/wingfangchu.rsi - type: Icon - sprite: Objects/Food/wingfangchu.rsi + sprite: Objects/Consumable/Food/wingfangchu.rsi - type: entity parent: FoodBase @@ -2917,9 +2917,9 @@ - ReagentId: chem.Nutriment Quantity: 2 - type: Sprite - sprite: Objects/Food/wishsoup.rsi + sprite: Objects/Consumable/Food/wishsoup.rsi - type: Icon - sprite: Objects/Food/wishsoup.rsi + sprite: Objects/Consumable/Food/wishsoup.rsi - type: entity parent: FoodBase @@ -2933,11 +2933,11 @@ - ReagentId: chem.Nutriment Quantity: 16 - type: Sprite - sprite: Objects/Food/xburger.rsi + sprite: Objects/Consumable/Food/xburger.rsi - type: Icon - sprite: Objects/Food/xburger.rsi + sprite: Objects/Consumable/Food/xburger.rsi - type: Item - sprite: Objects/Food/xburger.rsi + sprite: Objects/Consumable/Food/xburger.rsi - type: entity parent: FoodBase @@ -2953,9 +2953,9 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/xenobreadslice.rsi + sprite: Objects/Consumable/Food/xenobreadslice.rsi - type: Icon - sprite: Objects/Food/xenobreadslice.rsi + sprite: Objects/Consumable/Food/xenobreadslice.rsi - type: entity parent: FoodBase @@ -2969,9 +2969,9 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/xenomeat.rsi + sprite: Objects/Consumable/Food/xenomeat.rsi - type: Icon - sprite: Objects/Food/xenomeat.rsi + sprite: Objects/Consumable/Food/xenomeat.rsi - type: entity parent: FoodBase @@ -2987,9 +2987,9 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/xenomeatpie.rsi + sprite: Objects/Consumable/Food/xenomeatpie.rsi - type: Icon - sprite: Objects/Food/xenomeatpie.rsi + sprite: Objects/Consumable/Food/xenomeatpie.rsi - type: entity parent: FoodBase @@ -3005,9 +3005,9 @@ - ReagentId: chem.Bleach Quantity: 15 - type: Sprite - sprite: Objects/Food/stew.rsi + sprite: Objects/Consumable/Food/stew.rsi - type: Icon - sprite: Objects/Food/stew.rsi + sprite: Objects/Consumable/Food/stew.rsi - type: entity parent: FoodBase @@ -3024,6 +3024,6 @@ - ReagentId: chem.Nutriment Quantity: 20 - type: Sprite - sprite: Objects/Food/milkape.rsi + sprite: Objects/Consumable/Food/milkape.rsi - type: Icon - sprite: Objects/Food/milkape.rsi + sprite: Objects/Consumable/Food/milkape.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml index f9f10db3dd..cd9eb764e9 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml @@ -21,9 +21,9 @@ FoodAppleCakeSlice: 100 trash: TrashTray - type: Sprite - sprite: Objects/FoodContainers/apple_cake.rsi + sprite: Objects/Consumable/FoodContainers/apple_cake.rsi - type: Icon - sprite: Objects/FoodContainers/apple_cake.rsi + sprite: Objects/Consumable/FoodContainers/apple_cake.rsi - type: entity parent: FoodContainerBase @@ -34,9 +34,9 @@ prototypes: FoodBananaBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/bananabread.rsi + sprite: Objects/Consumable/FoodContainers/bananabread.rsi - type: Icon - sprite: Objects/FoodContainers/bananabread.rsi + sprite: Objects/Consumable/FoodContainers/bananabread.rsi - type: entity parent: FoodContainerBase @@ -47,9 +47,9 @@ prototypes: FoodBirthdayCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/birthdaycake.rsi + sprite: Objects/Consumable/FoodContainers/birthdaycake.rsi - type: Icon - sprite: Objects/FoodContainers/birthdaycake.rsi + sprite: Objects/Consumable/FoodContainers/birthdaycake.rsi - type: entity parent: FoodContainerBase @@ -60,9 +60,9 @@ prototypes: FoodBrainCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/braincake.rsi + sprite: Objects/Consumable/FoodContainers/braincake.rsi - type: Icon - sprite: Objects/FoodContainers/braincake.rsi + sprite: Objects/Consumable/FoodContainers/braincake.rsi - type: entity parent: FoodContainerBase @@ -73,9 +73,9 @@ prototypes: FoodBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/bread.rsi + sprite: Objects/Consumable/FoodContainers/bread.rsi - type: Icon - sprite: Objects/FoodContainers/bread.rsi + sprite: Objects/Consumable/FoodContainers/bread.rsi - type: entity parent: FoodContainerBase @@ -86,9 +86,9 @@ prototypes: FoodCarrotCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/carrotcake.rsi + sprite: Objects/Consumable/FoodContainers/carrotcake.rsi - type: Icon - sprite: Objects/FoodContainers/carrotcake.rsi + sprite: Objects/Consumable/FoodContainers/carrotcake.rsi - type: entity parent: FoodContainerBase @@ -99,9 +99,9 @@ prototypes: FoodCheeseCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/cheesecake.rsi + sprite: Objects/Consumable/FoodContainers/cheesecake.rsi - type: Icon - sprite: Objects/FoodContainers/cheesecake.rsi + sprite: Objects/Consumable/FoodContainers/cheesecake.rsi - type: entity parent: FoodContainerBase @@ -112,9 +112,9 @@ prototypes: FoodCheeseWedge: 100 - type: Sprite - sprite: Objects/FoodContainers/apple_cake.rsi + sprite: Objects/Consumable/FoodContainers/apple_cake.rsi - type: Icon - sprite: Objects/FoodContainers/apple_cake.rsi + sprite: Objects/Consumable/FoodContainers/apple_cake.rsi - type: entity parent: FoodContainerBase @@ -125,9 +125,9 @@ prototypes: FoodChocolateCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/chocolatecake.rsi + sprite: Objects/Consumable/FoodContainers/chocolatecake.rsi - type: Icon - sprite: Objects/FoodContainers/chocolatecake.rsi + sprite: Objects/Consumable/FoodContainers/chocolatecake.rsi - type: entity parent: FoodContainerBase @@ -138,9 +138,9 @@ prototypes: FoodCreamCheeseBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/creamcheesebread.rsi + sprite: Objects/Consumable/FoodContainers/creamcheesebread.rsi - type: Icon - sprite: Objects/FoodContainers/creamcheesebread.rsi + sprite: Objects/Consumable/FoodContainers/creamcheesebread.rsi - type: entity parent: FoodContainerBase @@ -153,9 +153,9 @@ FoodDonut: 70 FoodFrostedDonut: 30 - type: Sprite - sprite: Objects/FoodContainers/donutbox.rsi + sprite: Objects/Consumable/FoodContainers/donutbox.rsi - type: Icon - sprite: Objects/FoodContainers/donutbox.rsi + sprite: Objects/Consumable/FoodContainers/donutbox.rsi - type: Appearance visuals: - type: FoodContainerVisualizer2D @@ -173,11 +173,11 @@ prototypes: FoodContainerEggBox: 100 - type: Sprite - sprite: Objects/FoodContainers/eggbox_shut.rsi + sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi - type: Icon - sprite: Objects/FoodContainers/eggbox_shut.rsi + sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi - type: Item - sprite: Objects/FoodContainers/eggbox_shut.rsi + sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi - type: entity parent: FoodContainerBase @@ -189,13 +189,13 @@ prototypes: FoodEgg: 100 - type: Sprite - sprite: Objects/FoodContainers/eggbox.rsi + sprite: Objects/Consumable/FoodContainers/eggbox.rsi state: eggbox-12 - type: Icon - sprite: Objects/FoodContainers/eggbox.rsi + sprite: Objects/Consumable/FoodContainers/eggbox.rsi state: eggbox-12 - type: Item - sprite: Objects/FoodContainers/eggbox.rsi + sprite: Objects/Consumable/FoodContainers/eggbox.rsi - type: Appearance visuals: - type: FoodContainerVisualizer2D @@ -212,9 +212,9 @@ prototypes: FoodLemonCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/lemoncake.rsi + sprite: Objects/Consumable/FoodContainers/lemoncake.rsi - type: Icon - sprite: Objects/FoodContainers/lemoncake.rsi + sprite: Objects/Consumable/FoodContainers/lemoncake.rsi - type: entity parent: FoodContainerBase @@ -225,9 +225,9 @@ prototypes: FoodLimeCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/limecake.rsi + sprite: Objects/Consumable/FoodContainers/limecake.rsi - type: Icon - sprite: Objects/FoodContainers/limecake.rsi + sprite: Objects/Consumable/FoodContainers/limecake.rsi - type: entity parent: FoodContainerBase @@ -238,9 +238,9 @@ prototypes: FoodMeatBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/meatbread.rsi + sprite: Objects/Consumable/FoodContainers/meatbread.rsi - type: Icon - sprite: Objects/FoodContainers/meatbread.rsi + sprite: Objects/Consumable/FoodContainers/meatbread.rsi - type: entity parent: FoodContainerBase @@ -252,9 +252,9 @@ prototypes: FoodMeatPizzaSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/meatpizza.rsi + sprite: Objects/Consumable/FoodContainers/meatpizza.rsi - type: Icon - sprite: Objects/FoodContainers/meatpizza.rsi + sprite: Objects/Consumable/FoodContainers/meatpizza.rsi # These two will probably get moved one day - type: entity @@ -266,9 +266,9 @@ prototypes: FoodContainerMonkeyCubeWrap: 100 - type: Sprite - sprite: Objects/FoodContainers/monkeycubebox.rsi + sprite: Objects/Consumable/FoodContainers/monkeycubebox.rsi - type: Icon - sprite: Objects/FoodContainers/monkeycubebox.rsi + sprite: Objects/Consumable/FoodContainers/monkeycubebox.rsi - type: entity parent: FoodContainerBase @@ -279,9 +279,9 @@ prototypes: FoodMonkeyCube: 100 - type: Sprite - sprite: Objects/FoodContainers/monkeycubewrap.rsi + sprite: Objects/Consumable/FoodContainers/monkeycubewrap.rsi - type: Icon - sprite: Objects/FoodContainers/monkeycubewrap.rsi + sprite: Objects/Consumable/FoodContainers/monkeycubewrap.rsi - type: entity parent: FoodContainerBase @@ -293,9 +293,9 @@ prototypes: FoodMushroomPizzaSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/mushroompizza.rsi + sprite: Objects/Consumable/FoodContainers/mushroompizza.rsi - type: Icon - sprite: Objects/FoodContainers/mushroompizza.rsi + sprite: Objects/Consumable/FoodContainers/mushroompizza.rsi - type: entity parent: FoodContainerBase @@ -306,9 +306,9 @@ prototypes: FoodOrangeCakeSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/orangecake.rsi + sprite: Objects/Consumable/FoodContainers/orangecake.rsi - type: Icon - sprite: Objects/FoodContainers/orangecake.rsi + sprite: Objects/Consumable/FoodContainers/orangecake.rsi # TODO: Probably replace it with a stacking thing - type: entity @@ -320,9 +320,9 @@ prototypes: FoodContainerPizzaBox: 100 - type: Sprite - sprite: Objects/FoodContainers/pizzaboxstack.rsi + sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi - type: Icon - sprite: Objects/FoodContainers/pizzaboxstack.rsi + sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi - type: Appearance visuals: - type: FoodContainerVisualizer2D @@ -343,11 +343,11 @@ FoodContainerMushroomPizza: 25 FoodContainerVegetablePizza: 25 - type: Sprite - sprite: Objects/FoodContainers/pizzabox.rsi + sprite: Objects/Consumable/FoodContainers/pizzabox.rsi - type: Icon - sprite: Objects/FoodContainers/pizzabox.rsi + sprite: Objects/Consumable/FoodContainers/pizzabox.rsi - type: Item - sprite: Objects/FoodContainers/pizzabox.rsi + sprite: Objects/Consumable/FoodContainers/pizzabox.rsi - type: entity parent: FoodContainerBase @@ -359,9 +359,9 @@ prototypes: FoodMargheritaPizzaSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/pizzamargherita.rsi + sprite: Objects/Consumable/FoodContainers/pizzamargherita.rsi - type: Icon - sprite: Objects/FoodContainers/pizzamargherita.rsi + sprite: Objects/Consumable/FoodContainers/pizzamargherita.rsi - type: entity parent: FoodContainerBase @@ -373,9 +373,9 @@ FoodPlainCakeSlice: 100 trash: TrashTray - type: Sprite - sprite: Objects/FoodContainers/plaincake.rsi + sprite: Objects/Consumable/FoodContainers/plaincake.rsi - type: Icon - sprite: Objects/FoodContainers/plaincake.rsi + sprite: Objects/Consumable/FoodContainers/plaincake.rsi - type: entity parent: FoodContainerBase @@ -386,11 +386,11 @@ prototypes: FoodPumpkinPieSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/pumpkinpie.rsi + sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi - type: Icon - sprite: Objects/FoodContainers/pumpkinpie.rsi + sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi - type: Item - sprite: Objects/FoodContainers/pumpkinpie.rsi + sprite: Objects/Consumable/FoodContainers/pumpkinpie.rsi - type: entity parent: FoodContainerBase @@ -401,9 +401,9 @@ prototypes: FoodTofuBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/tofubread.rsi + sprite: Objects/Consumable/FoodContainers/tofubread.rsi - type: Icon - sprite: Objects/FoodContainers/tofubread.rsi + sprite: Objects/Consumable/FoodContainers/tofubread.rsi - type: entity parent: FoodContainerBase @@ -415,9 +415,9 @@ prototypes: FoodVegetablePizzaSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/vegetablepizza.rsi + sprite: Objects/Consumable/FoodContainers/vegetablepizza.rsi - type: Icon - sprite: Objects/FoodContainers/vegetablepizza.rsi + sprite: Objects/Consumable/FoodContainers/vegetablepizza.rsi - type: entity parent: FoodContainerBase @@ -428,6 +428,6 @@ prototypes: FoodXenomeatBreadSlice: 100 - type: Sprite - sprite: Objects/FoodContainers/xenomeatbread.rsi + sprite: Objects/Consumable/FoodContainers/xenomeatbread.rsi - type: Icon - sprite: Objects/FoodContainers/xenomeatbread.rsi + sprite: Objects/Consumable/FoodContainers/xenomeatbread.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml index aef848cc43..e33a5bf33f 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml @@ -14,9 +14,9 @@ transferAmount: 5 - type: Drink - type: Sprite - sprite: Objects/Food/flour.rsi + sprite: Objects/Consumable/Food/flour.rsi state: icon - type: Icon - sprite: Objects/Food/flour.rsi + sprite: Objects/Consumable/Food/flour.rsi state: icon - type: CanSpill diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash.yml b/Resources/Prototypes/Entities/Items/Consumables/trash.yml index 838178a434..31a6c07fda 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/trash.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/trash.yml @@ -16,9 +16,9 @@ id: TrashRaisins components: - type: Sprite - sprite: Objects/Trash/4no_raisins.rsi + sprite: Objects/Consumable/Trash/4no_raisins.rsi - type: Icon - sprite: Objects/Trash/4no_raisins.rsi + sprite: Objects/Consumable/Trash/4no_raisins.rsi - type: entity name: candy (trash) @@ -26,9 +26,9 @@ id: TrashCandy components: - type: Sprite - sprite: Objects/Trash/candy.rsi + sprite: Objects/Consumable/Trash/candy.rsi - type: Icon - sprite: Objects/Trash/candy.rsi + sprite: Objects/Consumable/Trash/candy.rsi - type: entity name: cheesie honkers (trash) @@ -36,9 +36,9 @@ id: TrashCheesieHonkers components: - type: Sprite - sprite: Objects/Trash/cheesie_honkers.rsi + sprite: Objects/Consumable/Trash/cheesie_honkers.rsi - type: Icon - sprite: Objects/Trash/cheesie_honkers.rsi + sprite: Objects/Consumable/Trash/cheesie_honkers.rsi - type: entity name: chips (trash) @@ -46,9 +46,9 @@ id: TrashChips components: - type: Sprite - sprite: Objects/Trash/chips.rsi + sprite: Objects/Consumable/Trash/chips.rsi - type: Icon - sprite: Objects/Trash/chips.rsi + sprite: Objects/Consumable/Trash/chips.rsi - type: entity name: corn cob (trash) @@ -56,9 +56,9 @@ id: TrashCornCob components: - type: Sprite - sprite: Objects/Trash/corncob.rsi + sprite: Objects/Consumable/Trash/corncob.rsi - type: Icon - sprite: Objects/Trash/corncob.rsi + sprite: Objects/Consumable/Trash/corncob.rsi - type: entity name: liquid food (trash) @@ -66,9 +66,9 @@ id: TrashLiquidFood components: - type: Sprite - sprite: Objects/Trash/liquidfood.rsi + sprite: Objects/Consumable/Trash/liquidfood.rsi - type: Icon - sprite: Objects/Trash/liquidfood.rsi + sprite: Objects/Consumable/Trash/liquidfood.rsi - type: entity name: pistachos pack (trash) @@ -76,9 +76,9 @@ id: TrashPistachiosPack components: - type: Sprite - sprite: Objects/Trash/pistachios_pack.rsi + sprite: Objects/Consumable/Trash/pistachios_pack.rsi - type: Icon - sprite: Objects/Trash/pistachios_pack.rsi + sprite: Objects/Consumable/Trash/pistachios_pack.rsi - type: entity name: messy pizza box (trash) @@ -86,9 +86,9 @@ id: TrashPizzaBoxMessy components: - type: Sprite - sprite: Objects/Trash/pizzabox_messy.rsi + sprite: Objects/Consumable/Trash/pizzabox_messy.rsi - type: Icon - sprite: Objects/Trash/pizzabox_messy.rsi + sprite: Objects/Consumable/Trash/pizzabox_messy.rsi - type: entity name: plastic bag (trash) @@ -96,9 +96,9 @@ id: TrashPlasticBag components: - type: Sprite - sprite: Objects/Trash/plasticbag.rsi + sprite: Objects/Consumable/Trash/plasticbag.rsi - type: Icon - sprite: Objects/Trash/plasticbag.rsi + sprite: Objects/Consumable/Trash/plasticbag.rsi - type: entity name: plate (trash) @@ -106,9 +106,9 @@ id: TrashPlate components: - type: Sprite - sprite: Objects/Trash/plate.rsi + sprite: Objects/Consumable/Trash/plate.rsi - type: Icon - sprite: Objects/Trash/plate.rsi + sprite: Objects/Consumable/Trash/plate.rsi - type: entity name: popcorn (trash) @@ -116,9 +116,9 @@ id: TrashPopcorn components: - type: Sprite - sprite: Objects/Trash/popcorn.rsi + sprite: Objects/Consumable/Trash/popcorn.rsi - type: Icon - sprite: Objects/Trash/popcorn.rsi + sprite: Objects/Consumable/Trash/popcorn.rsi - type: entity name: semki pack (trash) @@ -126,9 +126,9 @@ id: TrashSemkiPack components: - type: Sprite - sprite: Objects/Trash/semki_pack.rsi + sprite: Objects/Consumable/Trash/semki_pack.rsi - type: Icon - sprite: Objects/Trash/semki_pack.rsi + sprite: Objects/Consumable/Trash/semki_pack.rsi - type: entity name: snack bowl (trash) @@ -136,9 +136,9 @@ id: TrashSnackBowl components: - type: Sprite - sprite: Objects/Trash/snack_bowl.rsi + sprite: Objects/Consumable/Trash/snack_bowl.rsi - type: Icon - sprite: Objects/Trash/snack_bowl.rsi + sprite: Objects/Consumable/Trash/snack_bowl.rsi - type: entity name: SOS jerky (trash) @@ -146,9 +146,9 @@ id: TrashSOSJerky components: - type: Sprite - sprite: Objects/Trash/sosjerky.rsi + sprite: Objects/Consumable/Trash/sosjerky.rsi - type: Icon - sprite: Objects/Trash/sosjerky.rsi + sprite: Objects/Consumable/Trash/sosjerky.rsi - type: entity name: syndi cakes (trash) @@ -156,9 +156,9 @@ id: TrashSyndiCakes components: - type: Sprite - sprite: Objects/Trash/syndi_cakes.rsi + sprite: Objects/Consumable/Trash/syndi_cakes.rsi - type: Icon - sprite: Objects/Trash/syndi_cakes.rsi + sprite: Objects/Consumable/Trash/syndi_cakes.rsi - type: entity name: tasty bread (trash) @@ -166,9 +166,9 @@ id: TrashTastyBread components: - type: Sprite - sprite: Objects/Trash/tastybread.rsi + sprite: Objects/Consumable/Trash/tastybread.rsi - type: Icon - sprite: Objects/Trash/tastybread.rsi + sprite: Objects/Consumable/Trash/tastybread.rsi # TODO: Container - type: entity @@ -177,9 +177,9 @@ id: TrashBag components: - type: Sprite - sprite: Objects/Trash/trashbag.rsi + sprite: Objects/Consumable/Trash/trashbag.rsi - type: Icon - sprite: Objects/Trash/trashbag.rsi + sprite: Objects/Consumable/Trash/trashbag.rsi - type: entity name: tray (trash) @@ -187,9 +187,9 @@ id: TrashTray components: - type: Sprite - sprite: Objects/Trash/tray.rsi + sprite: Objects/Consumable/Trash/tray.rsi - type: Icon - sprite: Objects/Trash/tray.rsi + sprite: Objects/Consumable/Trash/tray.rsi - type: entity name: waffles (trash) @@ -197,6 +197,6 @@ id: TrashWaffles components: - type: Sprite - sprite: Objects/Trash/waffles.rsi + sprite: Objects/Consumable/Trash/waffles.rsi - type: Icon - sprite: Objects/Trash/waffles.rsi + sprite: Objects/Consumable/Trash/waffles.rsi diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml b/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml index db5caf9db1..9ea6e8240b 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml @@ -26,9 +26,9 @@ id: DrinkBottleAbsinthe components: - type: Sprite - sprite: Objects/TrashDrinks/absinthebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/absinthebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi - type: entity name: alcohol bottle @@ -36,9 +36,9 @@ id: DrinkBottleAlcoClear components: - type: Sprite - sprite: Objects/TrashDrinks/alco-clear.rsi + sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi - type: Icon - sprite: Objects/TrashDrinks/alco-clear.rsi + sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi - type: entity name: ale bottle @@ -46,9 +46,9 @@ id: DrinkBottleAle components: - type: Sprite - sprite: Objects/TrashDrinks/alebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/alebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi - type: entity name: beer bottle @@ -56,9 +56,9 @@ id: DrinkBottleBeer components: - type: Sprite - sprite: Objects/TrashDrinks/beer_empty.rsi + sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/beer_empty.rsi + sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi - type: entity name: broken bottle @@ -66,9 +66,9 @@ id: DrinkBrokenBottle components: - type: Sprite - sprite: Objects/TrashDrinks/broken_bottle.rsi + sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi - type: Icon - sprite: Objects/TrashDrinks/broken_bottle.rsi + sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi - type: entity name: cognac bottle @@ -76,9 +76,9 @@ id: DrinkBottleCognac components: - type: Sprite - sprite: Objects/TrashDrinks/cognacbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/cognacbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi - type: entity name: griffeater gin bottle @@ -86,9 +86,9 @@ id: DrinkBottleGin components: - type: Sprite - sprite: Objects/TrashDrinks/ginbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/ginbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/ginbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/ginbottle_empty.rsi - type: entity name: goldschlager bottle @@ -96,9 +96,9 @@ id: DrinkBottleGoldschlager components: - type: Sprite - sprite: Objects/TrashDrinks/goldschlagerbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/goldschlagerbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/goldschlagerbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/goldschlagerbottle_empty.rsi - type: entity name: kahlua bottle @@ -106,9 +106,9 @@ id: DrinkBottleKahlua components: - type: Sprite - sprite: Objects/TrashDrinks/kahluabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/kahluabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/kahluabottle_empty.rsi - type: entity name: nt cahors bottle @@ -116,9 +116,9 @@ id: DrinkBottleNTCahors components: - type: Sprite - sprite: Objects/TrashDrinks/ntcahors_empty.rsi + sprite: Objects/Consumable/TrashDrinks/ntcahors_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/ntcahors_empty.rsi + sprite: Objects/Consumable/TrashDrinks/ntcahors_empty.rsi - type: entity name: patron bottle @@ -126,9 +126,9 @@ id: DrinkBottlePatron components: - type: Sprite - sprite: Objects/TrashDrinks/patronbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/patronbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/patronbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/patronbottle_empty.rsi - type: entity name: poison wine bottle @@ -136,9 +136,9 @@ id: DrinkBottlePoisonWine components: - type: Sprite - sprite: Objects/TrashDrinks/pwinebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/pwinebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi - type: entity name: rum bottle @@ -146,9 +146,9 @@ id: DrinkBottleRum components: - type: Sprite - sprite: Objects/TrashDrinks/rumbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/rumbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/rumbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/rumbottle_empty.rsi - type: entity name: tequila bottle @@ -156,9 +156,9 @@ id: DrinkBottleTequila components: - type: Sprite - sprite: Objects/TrashDrinks/tequillabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/tequillabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi - type: entity name: vermouth bottle @@ -166,9 +166,9 @@ id: DrinkBottleVermouth components: - type: Sprite - sprite: Objects/TrashDrinks/vermouthbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/vermouthbottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi - type: entity name: vodka bottle @@ -176,9 +176,9 @@ id: DrinkBottleVodka components: - type: Sprite - sprite: Objects/TrashDrinks/vodkabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/vodkabottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi - type: entity name: whiskey bottle @@ -186,9 +186,9 @@ id: DrinkBottleWhiskey components: - type: Sprite - sprite: Objects/TrashDrinks/whiskeybottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/whiskeybottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi - type: entity name: wine bottle @@ -196,6 +196,6 @@ id: DrinkBottleWine components: - type: Sprite - sprite: Objects/TrashDrinks/winebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi - type: Icon - sprite: Objects/TrashDrinks/winebottle_empty.rsi + sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi diff --git a/Resources/Prototypes/Entities/Items/Instruments.yml b/Resources/Prototypes/Entities/Items/Instruments.yml index 3d66cea3ad..8ad1d2436f 100644 --- a/Resources/Prototypes/Entities/Items/Instruments.yml +++ b/Resources/Prototypes/Entities/Items/Instruments.yml @@ -19,14 +19,14 @@ - type: Instrument program: 62 - type: Sprite - sprite: Objects/Instruments/h_synthesizer.rsi + sprite: Objects/Fun/Instruments/h_synthesizer.rsi state: icon - type: Icon - sprite: Objects/Instruments/h_synthesizer.rsi + sprite: Objects/Fun/Instruments/h_synthesizer.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/h_synthesizer.rsi + sprite: Objects/Fun/Instruments/h_synthesizer.rsi - type: entity @@ -37,14 +37,14 @@ - type: Instrument program: 25 - type: Sprite - sprite: Objects/Instruments/guitar.rsi + sprite: Objects/Fun/Instruments/guitar.rsi state: icon - type: Icon - sprite: Objects/Instruments/guitar.rsi + sprite: Objects/Fun/Instruments/guitar.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/guitar.rsi + sprite: Objects/Fun/Instruments/guitar.rsi - type: entity name: violin @@ -54,14 +54,14 @@ - type: Instrument program: 40 - type: Sprite - sprite: Objects/Instruments/violin.rsi + sprite: Objects/Fun/Instruments/violin.rsi state: icon - type: Icon - sprite: Objects/Instruments/violin.rsi + sprite: Objects/Fun/Instruments/violin.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/violin.rsi + sprite: Objects/Fun/Instruments/violin.rsi - type: entity name: trumpet @@ -71,9 +71,9 @@ - type: Instrument program: 56 - type: Sprite - texture: Objects/Instruments/otherinstruments.rsi/trumpet.png + texture: Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png - type: Icon - texture: Objects/Instruments/otherinstruments.rsi/trumpet.png + texture: Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png - type: entity name: electric guitar @@ -83,14 +83,14 @@ - type: Instrument program: 27 - type: Sprite - sprite: Objects/Instruments/eguitar.rsi + sprite: Objects/Fun/Instruments/eguitar.rsi state: icon - type: Icon - sprite: Objects/Instruments/eguitar.rsi + sprite: Objects/Fun/Instruments/eguitar.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/eguitar.rsi + sprite: Objects/Fun/Instruments/eguitar.rsi - type: entity name: accordion @@ -100,14 +100,14 @@ - type: Instrument program: 21 - type: Sprite - sprite: Objects/Instruments/accordion.rsi + sprite: Objects/Fun/Instruments/accordion.rsi state: icon - type: Icon - sprite: Objects/Instruments/accordion.rsi + sprite: Objects/Fun/Instruments/accordion.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/accordion.rsi + sprite: Objects/Fun/Instruments/accordion.rsi - type: entity name: harmonica @@ -117,14 +117,14 @@ - type: Instrument program: 22 - type: Sprite - sprite: Objects/Instruments/harmonica.rsi + sprite: Objects/Fun/Instruments/harmonica.rsi state: icon - type: Icon - sprite: Objects/Instruments/harmonica.rsi + sprite: Objects/Fun/Instruments/harmonica.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/harmonica.rsi + sprite: Objects/Fun/Instruments/harmonica.rsi - type: entity name: recorder @@ -134,14 +134,14 @@ - type: Instrument program: 74 - type: Sprite - sprite: Objects/Instruments/recorder.rsi + sprite: Objects/Fun/Instruments/recorder.rsi state: icon - type: Icon - sprite: Objects/Instruments/recorder.rsi + sprite: Objects/Fun/Instruments/recorder.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/recorder.rsi + sprite: Objects/Fun/Instruments/recorder.rsi - type: entity name: trombone @@ -151,14 +151,14 @@ - type: Instrument program: 57 - type: Sprite - sprite: Objects/Instruments/trombone.rsi + sprite: Objects/Fun/Instruments/trombone.rsi state: icon - type: Icon - sprite: Objects/Instruments/trombone.rsi + sprite: Objects/Fun/Instruments/trombone.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/trombone.rsi + sprite: Objects/Fun/Instruments/trombone.rsi - type: entity name: saxophone @@ -168,14 +168,14 @@ - type: Instrument program: 67 - type: Sprite - sprite: Objects/Instruments/saxophone.rsi + sprite: Objects/Fun/Instruments/saxophone.rsi state: icon - type: Icon - sprite: Objects/Instruments/saxophone.rsi + sprite: Objects/Fun/Instruments/saxophone.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/saxophone.rsi + sprite: Objects/Fun/Instruments/saxophone.rsi - type: entity name: glockenspiel @@ -185,14 +185,14 @@ - type: Instrument program: 9 - type: Sprite - sprite: Objects/Instruments/glockenspiel.rsi + sprite: Objects/Fun/Instruments/glockenspiel.rsi state: icon - type: Icon - sprite: Objects/Instruments/glockenspiel.rsi + sprite: Objects/Fun/Instruments/glockenspiel.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/glockenspiel.rsi + sprite: Objects/Fun/Instruments/glockenspiel.rsi - type: entity name: banjo @@ -202,14 +202,14 @@ - type: Instrument program: 105 - type: Sprite - sprite: Objects/Instruments/banjo.rsi + sprite: Objects/Fun/Instruments/banjo.rsi state: icon - type: Icon - sprite: Objects/Instruments/banjo.rsi + sprite: Objects/Fun/Instruments/banjo.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/banjo.rsi + sprite: Objects/Fun/Instruments/banjo.rsi - type: entity name: gilded bike horn @@ -221,11 +221,11 @@ program: 1 bank: 1 - type: Sprite - sprite: Objects/Instruments/bike_horn.rsi + sprite: Objects/Fun/Instruments/bike_horn.rsi state: icon - type: Icon - sprite: Objects/Instruments/bike_horn.rsi + sprite: Objects/Fun/Instruments/bike_horn.rsi state: icon - type: Item Size: 24 - sprite: Objects/Instruments/bike_horn.rsi + sprite: Objects/Fun/Instruments/bike_horn.rsi diff --git a/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml b/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml index 1b495f7984..71daa6ef6c 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml @@ -5,17 +5,17 @@ desc: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products. components: - type: Sprite - sprite: Objects/Melee/cleaver.rsi + sprite: Objects/Weapons/Melee/cleaver.rsi size: 4 state: butch - type: Icon - sprite: Objects/Melee/cleaver.rsi + sprite: Objects/Weapons/Melee/cleaver.rsi state: butch - type: ItemCooldown - type: MeleeWeapon - type: Item Size: 10 - sprite: Objects/Melee/cleaver.rsi + sprite: Objects/Weapons/Melee/cleaver.rsi prefix: inhand diff --git a/Resources/Prototypes/Entities/Items/Weapons/mining.yml b/Resources/Prototypes/Entities/Items/Weapons/mining.yml index 4ed2bb2a92..76b7bed799 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/mining.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/mining.yml @@ -4,11 +4,11 @@ id: Pickaxe components: - type: Sprite - sprite: Objects/Melee/pickaxe.rsi + sprite: Objects/Weapons/Melee/pickaxe.rsi state: pickaxe - type: Icon - sprite: Objects/Melee/pickaxe.rsi + sprite: Objects/Weapons/Melee/pickaxe.rsi state: pickaxe - type: Pickaxe - type: ItemCooldown @@ -16,6 +16,6 @@ damage: 25 - type: Item Size: 24 - sprite: Objects/Melee/pickaxe.rsi + sprite: Objects/Weapons/Melee/pickaxe.rsi prefix: inhand - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Items/Weapons/security.yml b/Resources/Prototypes/Entities/Items/Weapons/security.yml index 957bab088b..499a8d8f1b 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/security.yml @@ -4,11 +4,11 @@ id: Stunbaton components: - type: Sprite - sprite: Objects/Melee/stunbaton.rsi + sprite: Objects/Weapons/Melee/stunbaton.rsi state: stunbaton_off - type: Icon - sprite: Objects/Melee/stunbaton.rsi + sprite: Objects/Weapons/Melee/stunbaton.rsi state: stunbaton_off - type: Stunbaton @@ -19,7 +19,7 @@ - type: Item Size: 10 - sprite: Objects/Melee/stunbaton.rsi + sprite: Objects/Weapons/Melee/stunbaton.rsi HeldPrefix: off - type: ItemCooldown @@ -30,23 +30,23 @@ id: Flash components: - type: Sprite - sprite: Objects/Melee/flash.rsi + sprite: Objects/Weapons/Melee/flash.rsi state: flash - type: Icon - sprite: Objects/Melee/flash.rsi + sprite: Objects/Weapons/Melee/flash.rsi state: flash - type: Flash damage: 0 cooldownTime: 1 arc: smash - hitSound: /Audio/weapons/flash.ogg + hitSound: /Audio/Weapons/flash.ogg slowTo: 0.7 - type: Item Size: 2 - sprite: Objects/Melee/flash.rsi + sprite: Objects/Weapons/Melee/flash.rsi - type: ItemCooldown diff --git a/Resources/Prototypes/Entities/Items/Weapons/spear.yml b/Resources/Prototypes/Entities/Items/Weapons/spear.yml index 1a9d68dbf9..369a0ad061 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/spear.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/spear.yml @@ -4,11 +4,11 @@ id: Spear components: - type: Sprite - sprite: Objects/Melee/spear.rsi + sprite: Objects/Weapons/Melee/spear.rsi state: spear - type: Icon - sprite: Objects/Melee/spear.rsi + sprite: Objects/Weapons/Melee/spear.rsi state: spear - type: MeleeWeapon @@ -18,7 +18,7 @@ - type: Item Size: 24 - sprite: Objects/Melee/spear.rsi + sprite: Objects/Weapons/Melee/spear.rsi prefix: inhand - type: ItemCooldown diff --git a/Resources/Prototypes/Entities/Items/bedsheets.yml b/Resources/Prototypes/Entities/Items/bedsheets.yml index a437f8bc6e..fcc8a7b31b 100644 --- a/Resources/Prototypes/Entities/Items/bedsheets.yml +++ b/Resources/Prototypes/Entities/Items/bedsheets.yml @@ -9,9 +9,14 @@ - Bed components: - type: Sprite - sprite: Objects/Furniture/bedsheets.rsi + sprite: Objects/Misc/bedsheets.rsi - type: Icon - sprite: Objects/Furniture/bedsheets.rsi + sprite: Objects/Misc/bedsheets.rsi + - type: Clothing + Size: 10 + QuickEquip: true + Slots: + - back - type: SnapGrid offset: Center @@ -29,7 +34,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_black.rsi HeldPrefix: sheetblack - type: entity @@ -46,7 +51,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_blue.rsi HeldPrefix: sheetblue - type: entity @@ -63,7 +68,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_brown.rsi HeldPrefix: sheetbrown - type: entity @@ -80,7 +85,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_captain.rsi HeldPrefix: sheetcaptain - type: entity @@ -97,7 +102,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_ce.rsi HeldPrefix: sheetce - type: entity @@ -114,7 +119,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_centcom.rsi HeldPrefix: sheetcentcom - type: entity @@ -131,7 +136,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi HeldPrefix: sheetrainbow - type: entity @@ -148,7 +153,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_cmo.rsi HeldPrefix: sheetcmo - type: entity @@ -165,7 +170,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_cosmos.rsi HeldPrefix: sheetcosmos - type: entity @@ -182,7 +187,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_cult.rsi HeldPrefix: sheetcult - type: entity @@ -199,7 +204,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_green.rsi HeldPrefix: sheetgreen - type: entity @@ -216,7 +221,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_grey.rsi HeldPrefix: sheetgrey - type: entity @@ -233,7 +238,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_hop.rsi HeldPrefix: sheethop - type: entity @@ -250,7 +255,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_hos.rsi HeldPrefix: sheethos - type: entity @@ -267,7 +272,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_ian.rsi HeldPrefix: sheetian - type: entity @@ -284,7 +289,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_medical.rsi HeldPrefix: sheetmedical - type: entity @@ -301,7 +306,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_mime.rsi HeldPrefix: sheetmime - type: entity @@ -318,7 +323,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_NT.rsi HeldPrefix: sheetNT - type: entity @@ -335,7 +340,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_orange.rsi HeldPrefix: sheetorange - type: entity @@ -352,7 +357,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_purple.rsi HeldPrefix: sheetpurple - type: entity @@ -369,7 +374,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_qm.rsi HeldPrefix: sheetqm - type: entity @@ -386,7 +391,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi HeldPrefix: sheetrainbow - type: entity @@ -403,7 +408,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_rd.rsi HeldPrefix: sheetrd - type: entity @@ -420,7 +425,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_red.rsi HeldPrefix: sheetred - type: entity @@ -437,7 +442,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_syndie.rsi HeldPrefix: sheetsyndie - type: entity @@ -454,7 +459,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_USA.rsi HeldPrefix: sheetUSA - type: entity @@ -471,7 +476,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_white.rsi HeldPrefix: sheetwhite - type: entity @@ -488,7 +493,7 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_wiz.rsi HeldPrefix: sheetwiz - type: entity @@ -505,5 +510,5 @@ QuickEquip: true Slots: - neck - sprite: Clothing/neck.rsi + sprite: Clothing/Neck/Bedsheets/sheet_yellow.rsi HeldPrefix: sheetyellow diff --git a/Resources/Prototypes/Entities/Items/bike_horn.yml b/Resources/Prototypes/Entities/Items/bike_horn.yml index 70cb9830cf..110ea694ec 100644 --- a/Resources/Prototypes/Entities/Items/bike_horn.yml +++ b/Resources/Prototypes/Entities/Items/bike_horn.yml @@ -18,7 +18,7 @@ - type: ItemCooldown - type: EmitSoundOnUse - sound: /Audio/items/bikehorn.ogg + sound: /Audio/Items/bikehorn.ogg variation: 0.2 - type: UseDelay diff --git a/Resources/Prototypes/Entities/Items/chemistry.yml b/Resources/Prototypes/Entities/Items/chemistry.yml index d84156dc0b..c8dc8607a2 100644 --- a/Resources/Prototypes/Entities/Items/chemistry.yml +++ b/Resources/Prototypes/Entities/Items/chemistry.yml @@ -5,11 +5,11 @@ id: Beaker components: - type: Sprite - texture: Objects/Chemistry/chemicals.rsi/beaker.png + texture: Objects/Specific/Chemistry/beakers.rsi/beaker.png - type: Icon - texture: Objects/Chemistry/chemicals.rsi/beaker.png + texture: Objects/Specific/Chemistry/beakers.rsi/beaker.png - type: Item - sprite: Objects/Chemistry/chemicals.rsi + sprite: Objects/Specific/Chemistry/beakers.rsi HeldPrefix: beaker - type: Solution fillingState: beaker @@ -26,11 +26,11 @@ id: LargeBeaker components: - type: Sprite - texture: Objects/Chemistry/chemicals.rsi/beakerlarge.png + texture: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png - type: Icon - texture: Objects/Chemistry/chemicals.rsi/beakerlarge.png + texture: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png - type: Item - sprite: Objects/Chemistry/chemicals.rsi + sprite: Objects/Specific/Chemistry/beakers.rsi HeldPrefix: beaker - type: Solution fillingState: beakerlarge @@ -47,9 +47,9 @@ id: Dropper components: - type: Sprite - texture: Objects/Chemistry/chemicals.rsi/dropper.png + texture: Objects/Specific/Chemistry/dropper.rsi/dropper.png - type: Icon - texture: Objects/Chemistry/chemicals.rsi/dropper.png + texture: Objects/Specific/Chemistry/dropper.rsi/dropper.png - type: Solution fillingState: dropper fillingSteps: 2 @@ -66,9 +66,9 @@ id: Syringe components: - type: Sprite - texture: Objects/Chemistry/syringe.rsi/0.png + texture: Objects/Specific/Chemistry/syringe.rsi/0.png - type: Icon - texture: Objects/Chemistry/syringe.rsi/0.png + texture: Objects/Specific/Chemistry/syringe.rsi/0.png - type: Solution fillingState: syringe fillingSteps: 5 diff --git a/Resources/Prototypes/Entities/Items/light_bulb.yml b/Resources/Prototypes/Entities/Items/light_bulb.yml index e3e250ab6f..f807df3aa3 100644 --- a/Resources/Prototypes/Entities/Items/light_bulb.yml +++ b/Resources/Prototypes/Entities/Items/light_bulb.yml @@ -7,11 +7,11 @@ bulb: Bulb - type: Sprite - sprite: Objects/Lighting/light_bulb.rsi + sprite: Objects/Power/light_bulb.rsi state: normal - type: Icon - sprite: Objects/Lighting/light_bulb.rsi + sprite: Objects/Power/light_bulb.rsi state: normal - type: entity @@ -31,11 +31,11 @@ bulb: Tube - type: Sprite - sprite: Objects/Lighting/light_tube.rsi + sprite: Objects/Power/light_tube.rsi state: normal - type: Icon - sprite: Objects/Lighting/light_tube.rsi + sprite: Objects/Power/light_tube.rsi state: normal - type: entity @@ -49,8 +49,8 @@ BurningTemperature: 350 PowerUse: 9 - type: Sprite - sprite: Objects/Lighting/light_tube.rsi + sprite: Objects/Power/light_tube.rsi state: normal - type: Icon - sprite: Objects/Lighting/light_tube.rsi + sprite: Objects/Power/light_tube.rsi state: normal diff --git a/Resources/Prototypes/Entities/Items/medical.yml b/Resources/Prototypes/Entities/Items/medical.yml index 9156430828..fd242ea5e7 100644 --- a/Resources/Prototypes/Entities/Items/medical.yml +++ b/Resources/Prototypes/Entities/Items/medical.yml @@ -5,9 +5,9 @@ id: Medkit components: - type: Sprite - texture: Objects/Medical/medkit_r.png + texture: Objects/Specific/Medical/medkit_r.png - type: Icon - texture: Objects/Medical/medkit_r.png + texture: Objects/Specific/Medical/medkit_r.png - type: Storage Capacity: 60 - type: Item @@ -36,9 +36,9 @@ id: Ointment components: - type: Sprite - texture: Objects/Medical/ointment.png + texture: Objects/Specific/Medical/ointment.png - type: Icon - texture: Objects/Medical/ointment.png + texture: Objects/Specific/Medical/ointment.png - type: Healing heal: 10 damage: Heat @@ -54,9 +54,9 @@ id: Brutepack components: - type: Sprite - texture: Objects/Medical/brutepack.png + texture: Objects/Specific/Medical/brutepack.png - type: Icon - texture: Objects/Medical/brutepack.png + texture: Objects/Specific/Medical/brutepack.png - type: Healing heal: 10 damage: Brute diff --git a/Resources/Prototypes/Entities/Items/powercells.yml b/Resources/Prototypes/Entities/Items/powercells.yml index 0b96615e9d..534e6b068d 100644 --- a/Resources/Prototypes/Entities/Items/powercells.yml +++ b/Resources/Prototypes/Entities/Items/powercells.yml @@ -103,13 +103,13 @@ components: - type: Sprite netsync: false - sprite: Objects/Power/PowerCells/cell_recharger.rsi + sprite: Constructible/Power/cell_recharger.rsi drawdepth: Items - type: PowerCellCharger transfer_efficiency: 0.85 - type: PowerReceiver - type: Icon - sprite: Objects/Power/PowerCells/cell_recharger.rsi + sprite: Constructible/Power/cell_recharger.rsi state: empty - type: Appearance visuals: @@ -133,13 +133,13 @@ components: - type: Sprite netsync: false - sprite: Objects/Power/PowerCells/recharger.rsi + sprite: Constructible/Power/recharger.rsi drawdepth: Items - type: WeaponCapacitorCharger transfer_efficiency: 0.85 - type: PowerReceiver - type: Icon - sprite: Objects/Power/PowerCells/recharger.rsi + sprite: Constructible/Power/recharger.rsi state: empty - type: Appearance visuals: @@ -163,13 +163,13 @@ components: - type: Sprite netsync: false - sprite: Objects/Power/PowerCells/wall_recharger.rsi + sprite: Constructible/Power/wall_recharger.rsi drawdepth: Items - type: WeaponCapacitorCharger transfer_efficiency: 0.95 - type: PowerReceiver - type: Icon - sprite: Objects/Power/PowerCells/wall_recharger.rsi + sprite: Constructible/Power/wall_recharger.rsi state: empty - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Items/skub.yml b/Resources/Prototypes/Entities/Items/skub.yml index de83fc91ba..1a61e0f37c 100644 --- a/Resources/Prototypes/Entities/Items/skub.yml +++ b/Resources/Prototypes/Entities/Items/skub.yml @@ -15,6 +15,7 @@ - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/skub.ogg + sound: /Audio/Items/skub.ogg + - type: UseDelay delay: 2.0 diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml index 95fdf7dbeb..316029604b 100644 --- a/Resources/Prototypes/Entities/Items/toolbox.yml +++ b/Resources/Prototypes/Entities/Items/toolbox.yml @@ -9,7 +9,7 @@ Size: 9999 - type: ItemCooldown - type: MeleeWeapon - hitSound: "/Audio/weapons/smash.ogg" + hitSound: "/Audio/Weapons/smash.ogg" - type: entity name: emergency toolbox diff --git a/Resources/Prototypes/Entities/Items/tools.yml b/Resources/Prototypes/Entities/Items/tools.yml index de96e9da17..12ff44c951 100644 --- a/Resources/Prototypes/Entities/Items/tools.yml +++ b/Resources/Prototypes/Entities/Items/tools.yml @@ -17,7 +17,7 @@ - type: Tool qualities: - Cutting - useSound: /Audio/items/wirecutter.ogg + useSound: /Audio/Items/wirecutter.ogg - type: RandomToolColor state: cutters colors: @@ -119,7 +119,7 @@ - type: Tool qualities: - Anchoring - useSound: /Audio/items/ratchet.ogg + useSound: /Audio/Items/ratchet.ogg - type: entity name: crowbar @@ -140,7 +140,7 @@ - type: Tool qualities: - Prying - useSound: /Audio/items/crowbar.ogg + useSound: /Audio/Items/crowbar.ogg - type: TilePrying - type: entity @@ -162,7 +162,7 @@ - type: Tool qualities: - Prying - useSound: /Audio/items/crowbar.ogg + useSound: /Audio/Items/crowbar.ogg - type: TilePrying - type: entity @@ -206,12 +206,12 @@ tools: - behavior: Prying state: jaws_pry - useSound: /Audio/items/jaws_pry.ogg - changeSound: /Audio/items/change_jaws.ogg + useSound: /Audio/Items/jaws_pry.ogg + changeSound: /Audio/Items/change_jaws.ogg - behavior: Cutting state: jaws_cutter - useSound: /Audio/items/jaws_cut.ogg - changeSound: /Audio/items/change_jaws.ogg + useSound: /Audio/Items/jaws_cut.ogg + changeSound: /Audio/Items/change_jaws.ogg - type: entity name: power drill @@ -235,9 +235,9 @@ tools: - behavior: Screwing state: drill_screw - useSound: /Audio/items/drill_use.ogg - changeSound: /Audio/items/change_drill.ogg + useSound: /Audio/Items/drill_use.ogg + changeSound: /Audio/Items/change_drill.ogg - behavior: Anchoring state: drill_bolt - useSound: /Audio/items/drill_use.ogg - changeSound: /Audio/items/change_drill.ogg + useSound: /Audio/Items/drill_use.ogg + changeSound: /Audio/Items/change_drill.ogg diff --git a/Resources/Prototypes/Entities/Items/toys.yml b/Resources/Prototypes/Entities/Items/toys.yml index d156c8571a..f9613968dc 100644 --- a/Resources/Prototypes/Entities/Items/toys.yml +++ b/Resources/Prototypes/Entities/Items/toys.yml @@ -126,7 +126,7 @@ - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/rattle.ogg + sound: /Audio/Items/Toys/rattle.ogg - type: UseDelay delay: 1.0 @@ -145,7 +145,7 @@ - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/mousesqueek.ogg + sound: /Audio/Items/Toys/mousesqueek.ogg - type: UseDelay delay: 1.0 @@ -164,11 +164,11 @@ - type: Item sprite: Objects/Misc/carvings.rsi - type: EmitSoundOnThrow - sound: /Audio/items/toys/helpme.ogg + sound: /Audio/Items/Toys/helpme.ogg - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/helpme.ogg + sound: /Audio/Items/Toys/helpme.ogg - type: UseDelay delay: 1.0 @@ -189,11 +189,11 @@ - type: Item sprite: Objects/Misc/carvings.rsi - type: EmitSoundOnThrow - sound: /Audio/items/toys/hellothere.ogg + sound: /Audio/Items/Toys/hellothere.ogg - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/hellothere.ogg + sound: /Audio/Items/Toys/hellothere.ogg - type: UseDelay delay: 1.0 @@ -212,11 +212,11 @@ - type: Item sprite: Objects/Misc/carvings.rsi - type: EmitSoundOnThrow - sound: /Audio/items/toys/thankyou.ogg + sound: /Audio/Items/Toys/thankyou.ogg - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/thankyou.ogg + sound: /Audio/Items/Toys/thankyou.ogg - type: UseDelay delay: 1.0 @@ -235,11 +235,11 @@ - type: Item sprite: Objects/Misc/carvings.rsi - type: EmitSoundOnThrow - sound: /Audio/items/toys/verygood.ogg + sound: /Audio/Items/Toys/verygood.ogg - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/verygood.ogg + sound: /Audio/Items/Toys/verygood.ogg - type: UseDelay delay: 1.0 @@ -258,11 +258,11 @@ - type: Item sprite: Objects/Misc/carvings.rsi - type: EmitSoundOnThrow - sound: /Audio/items/toys/imsorry.ogg + sound: /Audio/Items/Toys/imsorry.ogg - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/imsorry.ogg + sound: /Audio/Items/Toys/imsorry.ogg - type: UseDelay delay: 1.0 @@ -351,7 +351,7 @@ - type: ItemCooldown - type: LoopingSound - type: EmitSoundOnUse - sound: /Audio/items/toys/ian.ogg + sound: /Audio/Items/Toys/ian.ogg - type: UseDelay delay: 1.0 @@ -567,9 +567,9 @@ - Single fireRate: 0.5 capacity: 1 - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/click.ogg - soundInsert: /Audio/Guns/MagIn/drawbow2.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/click.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/drawbow2.ogg - type: entity name: ToyGunBase @@ -589,18 +589,18 @@ description: Looks almost like the real thing! Ages 8 and up. components: - type: Sprite - sprite: Objects/Fun/Toys.rsi + sprite: Objects/Fun/toys.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Fun/Toys.rsi + sprite: Objects/Fun/toys.rsi state: base - type: Item Size: 24 - sprite: Objects/Fun/Toys.rsi + sprite: Objects/Fun/toys.rsi state: base - type: RangedWeapon - type: BoltActionBarrel @@ -610,9 +610,9 @@ caliber: Cap capacity: 6 autoCycle: true - soundGunshot: /Audio/Guns/Gunshots/revolver.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D diff --git a/Resources/Prototypes/Entities/Items/utensils.yml b/Resources/Prototypes/Entities/Items/utensils.yml index 245b1b6642..c8ac6b3995 100644 --- a/Resources/Prototypes/Entities/Items/utensils.yml +++ b/Resources/Prototypes/Entities/Items/utensils.yml @@ -4,9 +4,10 @@ abstract: true components: - type: Sprite - sprite: Objects/utensils.rsi + sprite: Objects/Misc/utensils.rsi + - type: Icon - sprite: Objects/utensils.rsi + sprite: Objects/Misc/utensils.rsi - type: entity diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml index 3535f5d7e1..d6240e27fb 100644 --- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml @@ -4,8 +4,6 @@ components: - type: Sprite color: '#3F38' - layers: - - shader: unshaded - type: ConstructionGhost - type: Collidable - type: Clickable diff --git a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml index 3339833383..f5a840c392 100644 --- a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml @@ -6,10 +6,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Marker - type: Clickable @@ -27,10 +27,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_rifle - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_rifle - type: ConditionalSpawner prototypes: @@ -53,10 +53,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_pistol - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_pistol - type: ConditionalSpawner prototypes: @@ -83,10 +83,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_melee - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_melee - type: ConditionalSpawner prototypes: @@ -108,10 +108,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_revolver - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_revolver - type: ConditionalSpawner prototypes: @@ -130,10 +130,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_shotgun - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_shotgun - type: ConditionalSpawner prototypes: @@ -156,10 +156,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_smg - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_smg - type: ConditionalSpawner prototypes: @@ -181,10 +181,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_sniper - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_sniper - type: ConditionalSpawner prototypes: @@ -203,10 +203,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_hitscan - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_hitscan - type: ConditionalSpawner prototypes: @@ -229,10 +229,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_launcher - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_launcher - type: ConditionalSpawner prototypes: @@ -250,10 +250,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_grenade - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_grenade - type: ConditionalSpawner prototypes: diff --git a/Resources/Prototypes/Entities/Markers/marker_base.yml b/Resources/Prototypes/Entities/Markers/marker_base.yml index 51baba0381..582199bbf4 100644 --- a/Resources/Prototypes/Entities/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Markers/marker_base.yml @@ -9,10 +9,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue diff --git a/Resources/Prototypes/Entities/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Markers/spawn_points.yml index f7f11d98b2..bc1030a8ba 100644 --- a/Resources/Prototypes/Entities/Markers/spawn_points.yml +++ b/Resources/Prototypes/Entities/Markers/spawn_points.yml @@ -6,10 +6,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi - type: SpawnPoint - type: Marker - type: Clickable diff --git a/Resources/Prototypes/Entities/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Markers/timed_spawners.yml index 3a1a25b5cc..e9ff4e9f79 100644 --- a/Resources/Prototypes/Entities/Markers/timed_spawners.yml +++ b/Resources/Prototypes/Entities/Markers/timed_spawners.yml @@ -6,10 +6,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: cross_blue - type: Marker - type: Clickable @@ -27,10 +27,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_ai - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_ai - type: TimedSpawner prototypes: @@ -49,10 +49,10 @@ - type: Sprite netsync: false visible: false - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_xenoai - type: Icon - sprite: Objects/markers.rsi + sprite: Interface/Misc/markers.rsi state: spawner_xenoai - type: TimedSpawner prototypes: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 3ecbbd0322..da6be8b7e5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -18,10 +18,10 @@ - type: Sprite netsync: false drawdepth: Mobs - sprite: Buildings/VendingMachines/cola.rsi + sprite: Constructible/Power/VendingMachines/cola.rsi state: normal - type: Icon - sprite: Buildings/VendingMachines/cola.rsi + sprite: Constructible/Power/VendingMachines/cola.rsi state: normal - type: Physics mass: 85 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 6203b61bb2..f1c7228713 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -18,10 +18,10 @@ - type: InteractionOutline - type: Sprite drawdepth: Mobs - sprite: Mob/xeno.rsi + sprite: Mobs/Species/xeno.rsi state: running - type: Icon - sprite: Mob/xeno.rsi + sprite: Mobs/Species/xeno.rsi state: running - type: Physics mass: 85 diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml index de07a0f463..320f593f64 100644 --- a/Resources/Prototypes/Entities/Mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -37,48 +37,48 @@ layers: - map: ["enum.HumanoidVisualLayers.Chest"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_chest_m - map: ["enum.HumanoidVisualLayers.Head"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_head_m - - sprite: Mob/eyes.rsi + - sprite: Mobs/Customization/eyes.rsi state: eyes color: "#008800" - map: ["enum.HumanoidVisualLayers.RArm"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_arm - map: ["enum.HumanoidVisualLayers.LArm"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_arm - map: ["enum.HumanoidVisualLayers.RLeg"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_leg - map: ["enum.HumanoidVisualLayers.LLeg"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_leg - shader: StencilClear - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_leg - shader: StencilMask map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mob/masking_helpers.rsi + sprite: Mobs/Customization/masking_helpers.rsi state: female_full visible: false - map: ["enum.Slots.INNERCLOTHING"] shader: StencilDraw - map: ["enum.HumanoidVisualLayers.LHand"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_hand - map: ["enum.HumanoidVisualLayers.RHand"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_hand - map: ["enum.Slots.IDCARD"] - map: ["enum.Slots.GLOVES"] @@ -91,16 +91,16 @@ - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved - sprite: Mob/human_facial_hair.rsi + sprite: Mobs/Customization/human_facial_hair.rsi - map: ["enum.HumanoidVisualLayers.Hair"] state: bald - sprite: Mob/human_hair.rsi + sprite: Mobs/Customization/human_hair.rsi - map: ["enum.Slots.MASK"] - map: ["enum.Slots.HEAD"] - map: ["hand-left"] - map: ["hand-right"] - type: Icon - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_basic - type: Physics mass: 85 @@ -160,36 +160,36 @@ layers: - map: ["enum.HumanoidVisualLayers.Chest"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_chest_m - map: ["enum.HumanoidVisualLayers.Head"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_head_m - - sprite: Mob/eyes.rsi + - sprite: Mobs/Customization/eyes.rsi state: eyes color: "#008800" - map: ["enum.HumanoidVisualLayers.RArm"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_arm - map: ["enum.HumanoidVisualLayers.LArm"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_arm - map: ["enum.HumanoidVisualLayers.RLeg"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_leg - map: ["enum.HumanoidVisualLayers.LLeg"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_leg - shader: StencilClear - shader: StencilMask map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mob/masking_helpers.rsi + sprite: Mobs/Customization/masking_helpers.rsi state: female_full visible: false @@ -198,11 +198,11 @@ - map: ["enum.HumanoidVisualLayers.LHand"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_l_hand - map: ["enum.HumanoidVisualLayers.RHand"] color: "#e8b59b" - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_r_hand - map: ["enum.Slots.IDCARD"] @@ -216,17 +216,17 @@ - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved - sprite: Mob/human_facial_hair.rsi + sprite: Mobs/Customization/human_facial_hair.rsi - map: ["enum.HumanoidVisualLayers.Hair"] state: bald - sprite: Mob/human_hair.rsi + sprite: Mobs/Customization/human_hair.rsi - map: ["enum.Slots.MASK"] - map: ["enum.Slots.HEAD"] - map: ["hand-left"] - map: ["hand-right"] - type: Icon - sprite: Mob/human.rsi + sprite: Mobs/Species/human.rsi state: human_basic - type: Physics diff --git a/Resources/Prototypes/Entities/Mobs/observer.yml b/Resources/Prototypes/Entities/Mobs/observer.yml index 13ecc18a3d..9044015c70 100644 --- a/Resources/Prototypes/Entities/Mobs/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/observer.yml @@ -19,7 +19,7 @@ - type: Sprite netsync: false drawdepth: Ghosts - sprite: Mob/ghost.rsi + sprite: Mobs/Ghosts/ghost_human.rsi state: animated color: "#fff8" diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml index 7fcc34ab14..f01f6bbb45 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml @@ -8,11 +8,11 @@ capacity: 30 fillPrototype: CartridgeAntiMaterial - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi state: icon - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml index 318308a240..4fcc3c3c94 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml @@ -10,13 +10,13 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/large_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/large_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi state: base - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml index 329536ea41..2b72c6c7f9 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml @@ -33,9 +33,9 @@ capacity: 200 fillPrototype: CartridgeClRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi - type: entity id: BoxClRifleBigBox @@ -46,9 +46,9 @@ capacity: 200 fillPrototype: CartridgeClRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi - type: entity id: BoxClRifleBigBoxRubber @@ -59,9 +59,9 @@ capacity: 200 fillPrototype: CartridgeClRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi - type: entity id: BoxClRifleBox @@ -72,9 +72,9 @@ capacity: 60 fillPrototype: CartridgeClRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi - type: entity id: BoxClRifleBoxFlash @@ -85,9 +85,9 @@ capacity: 60 fillPrototype: CartridgeClRifleFlash - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi - type: entity id: BoxClRifleBoxHV @@ -98,9 +98,9 @@ capacity: 60 fillPrototype: CartridgeClRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi - type: entity id: BoxClRifleBoxPractice @@ -111,9 +111,9 @@ capacity: 60 fillPrototype: CartridgeClRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi - type: entity id: BoxClRifleBoxRubber @@ -124,6 +124,6 @@ capacity: 60 fillPrototype: CartridgeClRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml index 8d390bc4ca..0cabed783e 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml index 1f5253a496..f7d897f744 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml @@ -35,9 +35,9 @@ fillPrototype: CartridgeClRifle capacity: 99 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi - type: entity id: MagazineClRiflePistol @@ -49,9 +49,9 @@ magazineType: Pistol capacity: 10 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi - type: Appearance visuals: - type: MagVisualizer2D @@ -71,9 +71,9 @@ magazineType: Pistol capacity: 10 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi - type: Appearance visuals: - type: MagVisualizer2D @@ -91,9 +91,9 @@ magazineType: Pistol capacity: 10 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi - type: Appearance visuals: - type: MagVisualizer2D @@ -111,9 +111,9 @@ magazineType: Pistol capacity: 10 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi - type: Appearance visuals: - type: MagVisualizer2D @@ -129,9 +129,9 @@ - type: RangedMagazine fillPrototype: CartridgeClRifle - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi - type: entity id: MagazineClRifleHV @@ -141,9 +141,9 @@ - type: RangedMagazine fillPrototype: CartridgeClRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi - type: entity id: MagazineClRiflePractice @@ -153,9 +153,9 @@ - type: RangedMagazine fillPrototype: CartridgeClRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi - type: entity id: MagazineClRifleRubber @@ -165,9 +165,9 @@ - type: RangedMagazine fillPrototype: CartridgeClRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi - type: entity id: MagazineClRifleShort @@ -178,9 +178,9 @@ fillPrototype: CartridgeClRifle capacity: 20 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi - type: entity id: MagazineClRifleShortFlash @@ -191,9 +191,9 @@ fillPrototype: CartridgeClRifleFlash capacity: 20 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi - type: entity id: MagazineClRifleShortHV @@ -204,9 +204,9 @@ fillPrototype: CartridgeClRifleHV capacity: 20 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi - type: entity id: MagazineClRifleShortPractice @@ -217,9 +217,9 @@ fillPrototype: CartridgeClRiflePractice capacity: 20 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi - type: entity id: MagazineClRifleShortRubber @@ -230,6 +230,6 @@ fillPrototype: CartridgeClRifleRubber capacity: 20 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml index 9f4713101c..a808bcf81e 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml @@ -10,11 +10,11 @@ caseless: true - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Explosives/rpg.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi state: frag drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Explosives/rpg.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi state: frag - type: entity @@ -27,13 +27,13 @@ projectile: BulletGrenadeBaton - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Explosives/grenade_baton.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Explosives/grenade_baton.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi state: base - type: Appearance visuals: @@ -49,13 +49,13 @@ projectile: BulletGrenadeBlast - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Explosives/grenade_blast.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Explosives/grenade_blast.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi state: base - type: Appearance visuals: @@ -71,13 +71,13 @@ projectile: BulletGrenadeFlash - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Explosives/grenade_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Explosives/grenade_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi state: base - type: Appearance visuals: @@ -93,13 +93,13 @@ projectile: BulletGrenadeFrag - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/Explosives/grenade_frag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Explosives/grenade_frag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi state: base - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml index 388ce6e199..ddce1758a6 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml @@ -33,9 +33,9 @@ capacity: 200 fillPrototype: CartridgeLRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi - type: entity id: BoxLRifleBoxHV @@ -46,9 +46,9 @@ capacity: 50 fillPrototype: CartridgeLRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi - type: entity id: BoxLRifleBoxPractice @@ -59,9 +59,9 @@ capacity: 50 fillPrototype: CartridgeLRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi - type: entity id: BoxLRifleBoxRubber @@ -72,6 +72,6 @@ capacity: 50 fillPrototype: CartridgeLRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml index 13b526ecbc..692780a077 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml index 699a753350..75e8d4a927 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml @@ -36,9 +36,9 @@ magazineType: Box capacity: 50 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi - type: Appearance visuals: - type: MagVisualizer2D @@ -54,9 +54,9 @@ - type: RangedMagazine fillPrototype: CartridgeLRifle - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi - type: entity id: MagazineLRifleFlash @@ -66,9 +66,9 @@ - type: RangedMagazine fillPrototype: CartridgeLRifleFlash - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi - type: entity id: MagazineLRifleHV @@ -78,9 +78,9 @@ - type: RangedMagazine fillPrototype: CartridgeLRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi - type: entity id: MagazineLRiflePractice @@ -90,9 +90,9 @@ - type: RangedMagazine fillPrototype: CartridgeLRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi - type: entity id: MagazineLRifleRubber @@ -102,9 +102,9 @@ - type: RangedMagazine fillPrototype: CartridgeLRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi - type: entity id: MagazineLRifleMaxim @@ -116,9 +116,9 @@ capacity: 96 magazineType: Pan - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi - type: entity id: MagazineLRiflePkBox @@ -130,9 +130,9 @@ magazineType: Box capacity: 80 - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi - type: Appearance visuals: - type: MagVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml index b056dc269d..aff2129a86 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml @@ -8,11 +8,11 @@ capacity: 5 fillPrototype: CartridgeLRifle - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi state: icon - type: Sprite netsync: false - sprite: Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml index d328f29002..ab2ab71c6d 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml @@ -33,9 +33,9 @@ capacity: 60 fillPrototype: CartridgeMagnum - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi - type: entity id: BoxMagnumFlash @@ -46,9 +46,9 @@ capacity: 60 fillPrototype: CartridgeMagnumFlash - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi - type: entity id: BoxMagnumHV @@ -59,9 +59,9 @@ capacity: 60 fillPrototype: CartridgeMagnumHV - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi - type: entity id: BoxMagnumPractice @@ -72,9 +72,9 @@ capacity: 60 fillPrototype: CartridgeMagnumPractice - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi - type: entity id: BoxMagnumRubber @@ -85,6 +85,6 @@ capacity: 60 fillPrototype: CartridgeMagnumRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml index c9beea957a..2bcc2ee1d4 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml index d8de32ec80..3fdec414ae 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml @@ -60,9 +60,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnum - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi - type: entity id: MagazineMagnumFlash @@ -72,9 +72,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumFlash - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi - type: entity id: MagazineMagnumHV @@ -84,9 +84,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi - type: entity id: MagazineMagnumPractice @@ -96,9 +96,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumPractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi - type: entity id: MagazineMagnumRubber @@ -108,9 +108,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi - type: entity id: MagazineMagnumSmg @@ -120,9 +120,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnum - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi - type: entity id: MagazineMagnumSmgHV @@ -132,9 +132,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi - type: entity id: MagazineMagnumSmgPractice @@ -144,9 +144,9 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumPractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi - type: entity id: MagazineMagnumSmgRubber @@ -156,6 +156,6 @@ - type: RangedMagazine fillPrototype: CartridgeMagnumRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml index 4138c655fe..5c41e1e5bd 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml @@ -31,9 +31,9 @@ - type: SpeedLoader fillPrototype: CartridgeMagnum - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi - type: entity id: SLMagnumFlash @@ -43,9 +43,9 @@ - type: SpeedLoader fillPrototype: CartridgeMagnumFlash - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi - type: entity id: SLMagnumHV @@ -55,9 +55,9 @@ - type: SpeedLoader fillPrototype: CartridgeMagnumHV - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi - type: entity id: SLMagnumPractice @@ -67,9 +67,9 @@ - type: SpeedLoader fillPrototype: CartridgeMagnumPractice - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi - type: entity id: SLMagnumRubber @@ -79,6 +79,6 @@ - type: SpeedLoader fillPrototype: CartridgeMagnumRubber - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml index 9a42990627..e9f249f91d 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml @@ -33,9 +33,9 @@ capacity: 60 fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi - type: entity id: BoxPistolBoxFlash @@ -46,9 +46,9 @@ capacity: 60 fillPrototype: CartridgePistolFlash - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi - type: entity id: BoxPistolBoxHV @@ -59,9 +59,9 @@ capacity: 60 fillPrototype: CartridgePistolHV - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi - type: entity id: BoxPistolBoxPractice @@ -72,9 +72,9 @@ capacity: 60 fillPrototype: CartridgePistolPractice - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi - type: entity id: BoxPistolBoxRubber @@ -85,6 +85,6 @@ capacity: 60 fillPrototype: CartridgePistolRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml index e10bbbef06..99e4ad3a1a 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml index 9297fd2f18..0bb29dc63b 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml @@ -85,9 +85,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -109,9 +109,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi - type: entity id: MagazinePistolFlash @@ -121,9 +121,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolFlash - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi - type: entity id: MagazinePistolHV @@ -133,9 +133,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi - type: entity id: MagazinePistolPractice @@ -145,9 +145,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolPractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi - type: entity id: MagazinePistolRubber @@ -157,9 +157,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi - type: entity id: MagazineHCPistol @@ -169,9 +169,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi - type: entity id: MagazineHCPistolHV @@ -181,9 +181,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi - type: entity id: MagazineHCPistolPractice @@ -193,9 +193,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi - type: entity id: MagazineHCPistolRubber @@ -205,9 +205,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi - type: entity id: MagazinePistolSmg @@ -217,9 +217,9 @@ - type: RangedMagazine fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi - type: entity id: MagazinePistolSmgFlash @@ -229,9 +229,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolFlash - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi - type: entity id: MagazinePistolSmgHV @@ -241,9 +241,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi - type: entity id: MagazinePistolSmgPractice @@ -253,9 +253,9 @@ - type: RangedMagazine fillPrototype: CartridgePistolPractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi - type: entity id: MagazinePistolSmgRubber @@ -265,6 +265,6 @@ - type: RangedMagazine fillPrototype: CartridgePistolRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml index 813c230dc3..4e254d87aa 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml @@ -31,9 +31,9 @@ - type: SpeedLoader fillPrototype: CartridgePistol - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi - type: entity id: SLPistolFlash @@ -43,9 +43,9 @@ - type: SpeedLoader fillPrototype: CartridgePistolFlash - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi - type: entity id: SLPistolHV @@ -55,9 +55,9 @@ - type: SpeedLoader fillPrototype: CartridgePistolHV - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi - type: entity id: SLPistolPractice @@ -67,9 +67,9 @@ - type: SpeedLoader fillPrototype: CartridgePistolPractice - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi - type: entity id: SLPistolRubber @@ -79,6 +79,6 @@ - type: SpeedLoader fillPrototype: CartridgePistolRubber - type: Icon - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml index 8f3b628dfb..978ae0f77e 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml @@ -33,9 +33,9 @@ capacity: 200 fillPrototype: CartridgeSRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi - type: entity id: BoxSRifleBigBoxRubber @@ -46,9 +46,9 @@ capacity: 200 fillPrototype: CartridgeSRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi - type: entity id: BoxSRifleBox @@ -59,9 +59,9 @@ capacity: 60 fillPrototype: CartridgeSRifle - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi - type: entity id: BoxSRifleBoxFlash @@ -72,9 +72,9 @@ capacity: 60 fillPrototype: CartridgeSRifleFlash - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi - type: entity id: BoxSRifleBoxHV @@ -85,9 +85,9 @@ capacity: 60 fillPrototype: CartridgeSRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi - type: entity id: BoxSRifleBoxPractice @@ -98,9 +98,9 @@ capacity: 60 fillPrototype: CartridgeSRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi - type: entity id: BoxSRifleBoxRubber @@ -111,6 +111,6 @@ capacity: 60 fillPrototype: CartridgeSRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml index b34c8510ed..0e1d477801 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: s-casing - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml index a80afe0f5f..235779960a 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml @@ -34,9 +34,9 @@ - type: RangedMagazine fillPrototype: CartridgeSRifle - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi - type: entity id: MagazineSRifleFlash @@ -46,9 +46,9 @@ - type: RangedMagazine fillPrototype: CartridgeSRifleFlash - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi - type: entity id: MagazineSRifleHV @@ -58,9 +58,9 @@ - type: RangedMagazine fillPrototype: CartridgeSRifleHV - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi - type: entity id: MagazineSRiflePractice @@ -70,9 +70,9 @@ - type: RangedMagazine fillPrototype: CartridgeSRiflePractice - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi - type: entity id: MagazineSRifleRubber @@ -82,6 +82,6 @@ - type: RangedMagazine fillPrototype: CartridgeSRifleRubber - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml index da90fe12bc..d34b5e51b1 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml @@ -11,13 +11,13 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi layers: - state: base map: ["enum.AmmoVisualLayers.Base"] drawdepth: FloorObjects - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: base - type: Appearance visuals: @@ -29,9 +29,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi - type: Ammo ammoSpread: 0 projectile: PelletShotgunBeanbag @@ -43,9 +43,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi - type: Ammo projectile: PelletShotgunSlug projectilesFired: 4 @@ -57,9 +57,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - type: Ammo projectile: PelletShotgun projectilesFired: 6 @@ -70,9 +70,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi - type: Ammo projectile: PelletShotgunFlash projectilesFired: 6 @@ -83,9 +83,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi - type: Ammo projectile: PelletShotgun projectilesFired: 6 @@ -96,9 +96,9 @@ parent: ShellShotgunBase components: - type: Sprite - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi - type: Icon - sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi - type: Ammo projectile: PelletShotgun projectilesFired: 6 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml index b5dca3bdbf..6b6c207a0f 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml @@ -32,9 +32,9 @@ - type: RangedMagazine fillPrototype: ShellShotgun - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi - type: entity id: MagazineShotgunBeanbag @@ -44,9 +44,9 @@ - type: RangedMagazine fillPrototype: ShellShotgunBeanbag - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi - type: entity id: MagazineShotgunSlug @@ -56,6 +56,6 @@ - type: RangedMagazine fillPrototype: ShellShotgunSlug - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml index 5508caced2..9b5fb5fef3 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml @@ -5,7 +5,7 @@ parent: BulletBase components: - type: Sprite - sprite: Objects/Guns/Projectiles/slug.rsi + sprite: Objects/Weapons/Guns/Projectiles/slug.rsi state: base - type: Projectile damages: @@ -18,7 +18,7 @@ parent: BulletBase components: - type: Sprite - sprite: Objects/Guns/Projectiles/buckshot.rsi + sprite: Objects/Weapons/Guns/Projectiles/buckshot.rsi state: base - type: Projectile damages: @@ -32,7 +32,7 @@ parent: BulletBase components: - type: Sprite - sprite: Objects/Guns/Projectiles/buckshot.rsi + sprite: Objects/Weapons/Guns/Projectiles/buckshot.rsi state: base - type: Projectile damages: @@ -45,7 +45,7 @@ parent: BulletBaseFlash components: - type: Sprite - sprite: Objects/Guns/Projectiles/buckshot.rsi + sprite: Objects/Weapons/Guns/Projectiles/buckshot.rsi state: base - type: Projectile damages: @@ -58,7 +58,7 @@ parent: BulletBase components: - type: Sprite - sprite: Objects/Guns/Projectiles/buckshot.rsi + sprite: Objects/Weapons/Guns/Projectiles/buckshot.rsi state: base - type: Projectile damages: @@ -71,7 +71,7 @@ parent: BulletBasePractice components: - type: Sprite - sprite: Objects/Guns/Projectiles/buckshot.rsi + sprite: Objects/Weapons/Guns/Projectiles/buckshot.rsi state: base - type: Projectile damages: diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml index fe73940524..e05a67e888 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml @@ -9,11 +9,11 @@ - type: Sprite netsync: false directional: true - sprite: Objects/Trash/ash.rsi + sprite: Objects/Consumable/Trash/ash.rsi state: icon drawdepth: FloorObjects - type: Icon - sprite: Objects/Trash/ash.rsi + sprite: Objects/Consumable/Trash/ash.rsi state: icon - type: entity diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml index 4351d8bcec..625d4d6d2d 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml @@ -1,11 +1,11 @@ - type: soundCollection id: CasingEject files: - - "/Audio/Guns/Casings/casing_fall_1.ogg" - - "/Audio/Guns/Casings/casing_fall_2.ogg" - - "/Audio/Guns/Casings/casing_fall_3.ogg" + - "/Audio/Weapons/Guns/Casings/casing_fall_1.ogg" + - "/Audio/Weapons/Guns/Casings/casing_fall_2.ogg" + - "/Audio/Weapons/Guns/Casings/casing_fall_3.ogg" - type: soundCollection id: ShellEject files: - - "/Audio/Guns/Casings/shotgun_fall.ogg" \ No newline at end of file + - "/Audio/Weapons/Guns/Casings/shotgun_fall.ogg" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml index 91dbc8de10..7a57cfed3f 100644 --- a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml @@ -6,7 +6,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Battery/laser_retro.rsi + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -14,11 +14,11 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Battery/laser_retro.rsi + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi state: icon - type: Item Size: 24 - sprite: Objects/Guns/Battery/laser_retro.rsi + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi - type: RangedWeapon - type: BatteryBarrel minAngle: 10 @@ -31,7 +31,7 @@ fireRate: 2 powerCellPrototype: PowerCellSmallStandard ammoPrototype: RedLaser - soundGunshot: /Audio/Guns/Gunshots/laser.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -47,7 +47,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Battery/laser_cannon.rsi + sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -55,11 +55,11 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Battery/laser_cannon.rsi + sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi state: icon - type: Item Size: 24 - sprite: Objects/Guns/Battery/laser_cannon.rsi + sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi - type: RangedWeapon - type: BatteryBarrel currentSelector: Single @@ -72,7 +72,7 @@ angleDecay: 45 powerCellPrototype: PowerCellSmallSuper ammoPrototype: RedHeavyLaser - soundGunshot: /Audio/Guns/Gunshots/laser_cannon.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -88,7 +88,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Battery/xray.rsi + sprite: Objects/Weapons/Guns/Battery/xray.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -96,11 +96,11 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Battery/xray.rsi + sprite: Objects/Weapons/Guns/Battery/xray.rsi state: icon - type: Item Size: 24 - sprite: Objects/Guns/Battery/xray.rsi + sprite: Objects/Weapons/Guns/Battery/xray.rsi - type: RangedWeapon - type: BatteryBarrel currentSelector: Single @@ -114,7 +114,7 @@ powerCellPrototype: PowerCellSmallSuper base_fire_cost: 600 ammoPrototype: XrayLaser - soundGunshot: /Audio/Guns/Gunshots/laser3.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -130,7 +130,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Battery/taser.rsi + sprite: Objects/Weapons/Guns/Battery/taser.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -138,11 +138,11 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Battery/taser.rsi + sprite: Objects/Weapons/Guns/Battery/taser.rsi state: icon - type: Item Size: 24 - sprite: Objects/Guns/Battery/taser.rsi + sprite: Objects/Weapons/Guns/Battery/taser.rsi prefix: icon - type: RangedWeapon - type: BatteryBarrel @@ -156,7 +156,7 @@ angleDecay: 15 powerCellPrototype: PowerCellSmallStandard ammoPrototype: BulletTaser - soundGunshot: /Audio/Guns/Gunshots/taser.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/taser.ogg - type: Appearance visuals: - type: MagVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml index 8949ecc128..b4858dc871 100644 --- a/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml @@ -5,12 +5,12 @@ id: ExGrenade components: - type: Sprite - sprite: Objects/Grenades/grenade.rsi + sprite: Objects/Weapons/Grenades/grenade.rsi layers: - state: icon map: ["enum.TriggerVisualLayers.Base"] - type: Icon - sprite: Objects/Grenades/grenade.rsi + sprite: Objects/Weapons/Grenades/grenade.rsi state: icon - type: Item Size: 5 @@ -27,7 +27,7 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer2D - countdown_sound: /Audio/effects/countdown.ogg + countdown_sound: /Audio/Effects/countdown.ogg - type: entity name: flashbang @@ -36,12 +36,12 @@ id: GrenadeFlashBang components: - type: Sprite - sprite: Objects/Grenades/flashbang.rsi + sprite: Objects/Weapons/Grenades/flashbang.rsi layers: - state: icon map: ["enum.TriggerVisualLayers.Base"] - type: Icon - sprite: Objects/Grenades/flashbang.rsi + sprite: Objects/Weapons/Grenades/flashbang.rsi state: icon - type: Item Size: 5 @@ -54,7 +54,7 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer2D - countdown_sound: /Audio/effects/countdown.ogg + countdown_sound: /Audio/Effects/countdown.ogg - type: entity name: Syndicate minibomb @@ -63,12 +63,12 @@ id: SyndieMiniBomb components: - type: Sprite - sprite: Objects/Grenades/syndgrenade.rsi + sprite: Objects/Weapons/Grenades/syndgrenade.rsi layers: - state: icon map: ["enum.TriggerVisualLayers.Base"] - type: Icon - sprite: Objects/Grenades/syndgrenade.rsi + sprite: Objects/Weapons/Grenades/syndgrenade.rsi state: icon - type: Item Size: 5 @@ -85,4 +85,4 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer2D - countdown_sound: /Audio/effects/countdown.ogg + countdown_sound: /Audio/Effects/countdown.ogg diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml index e81a103849..c1359f68a4 100644 --- a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -25,14 +25,14 @@ angleIncrease: 10 angleDecay: 60 magNeedsOpenBolt: true - soundGunshot: /Audio/Guns/Gunshots/lmg.ogg - soundEmpty: /Audio/Guns/Empty/lmg_empty.ogg - soundRack: /Audio/Guns/Cock/lmg_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundAutoEject: /Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg - soundMagInsert: /Audio/Guns/MagIn/lmg_magin.ogg - soundMagEject: /Audio/Guns/MagOut/lmg_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/lmg.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/lmg_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundAutoEject: /Audio/Weapons/Guns/EmptyAlarm/lmg_empty_alarm.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg - type: entity name: L6 SAW @@ -41,7 +41,7 @@ description: A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. This one is unmarked. components: - type: Sprite - sprite: Objects/Guns/LMGs/l6.rsi + sprite: Objects/Weapons/Guns/LMGs/l6.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -50,10 +50,10 @@ - state: mag-3 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/LMGs/l6.rsi + sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: Item Size: 24 - sprite: Objects/Guns/LMGs/l6.rsi + sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: RangedWeapon - type: MagazineBarrel magFillPrototype: MagazineLRifleBox @@ -77,7 +77,7 @@ description: Kalashnikov's Machinegun, a well preserved and maintained antique weapon of war. components: - type: Sprite - sprite: Objects/Guns/LMGs/pk.rsi + sprite: Objects/Weapons/Guns/LMGs/pk.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -86,10 +86,10 @@ - state: mag-5 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/LMGs/pk.rsi + sprite: Objects/Weapons/Guns/LMGs/pk.rsi - type: Item Size: 24 - sprite: Objects/Guns/LMGs/pk.rsi + sprite: Objects/Weapons/Guns/LMGs/pk.rsi - type: RangedWeapon - type: MagazineBarrel magFillPrototype: MagazineLRiflePkBox diff --git a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml index 62950fff8b..394b3be76b 100644 --- a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml @@ -20,17 +20,17 @@ description: This centuries-old design was recently rediscovered and adapted for use in modern battlefields. Working similar to a pump-action combat shotgun, its light weight and robust design quickly made it a popular weapon. It uses specialised grenade shells. components: - type: Sprite - sprite: Objects/Guns/Launchers/china_lake.rsi + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Launchers/china_lake.rsi + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Item Size: 24 - sprite: Objects/Guns/Launchers/china_lake.rsi + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: RangedWeapon - type: BoltActionBarrel caliber: Grenade @@ -40,9 +40,9 @@ fillPrototype: GrenadeFrag fireRate: 1 capacity: 3 - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/grenade_launcher.ogg - soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -54,17 +54,17 @@ description: A modified ancient rocket-propelled grenade launcher, this design is centuries old, but well preserved. components: - type: Sprite - sprite: Objects/Guns/Launchers/rocket.rsi + sprite: Objects/Weapons/Guns/Launchers/rocket.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Launchers/rocket.rsi + sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Item Size: 24 - sprite: Objects/Guns/Launchers/rocket.rsi + sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: RangedWeapon - type: RevolverBarrel caliber: Rocket @@ -74,9 +74,9 @@ fillPrototype: RocketAmmo fireRate: 0.5 capacity: 1 - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/rpgfire.ogg - soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: - type: MagVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml index 8774592200..5b8ca703a6 100644 --- a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -32,13 +32,13 @@ angleIncrease: 10 angleDecay: 60 magFillPrototype: MagazinePistol - soundGunshot: /Audio/Guns/Gunshots/pistol.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/pistol_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Guns/MagIn/pistol_magin.ogg - soundMagEject: /Audio/Guns/MagOut/pistol_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -54,12 +54,12 @@ description: components: - type: Sprite - sprite: Objects/Guns/Pistols/clarissa.rsi + sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: Icon - sprite: Objects/Guns/Pistols/clarissa.rsi + sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/clarissa.rsi + sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -79,17 +79,17 @@ description: components: - type: Sprite - sprite: Objects/Guns/Pistols/colt.rsi + sprite: Objects/Weapons/Guns/Pistols/colt.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/colt.rsi + sprite: Objects/Weapons/Guns/Pistols/colt.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/colt.rsi + sprite: Objects/Weapons/Guns/Pistols/colt.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -111,12 +111,12 @@ description: A popular "Frozen Star" brand pocket pistol chambered for the ubiquitous .35 auto round. Uses standard capacity magazines. components: - type: Sprite - sprite: Objects/Guns/Pistols/giskard.rsi + sprite: Objects/Weapons/Guns/Pistols/giskard.rsi - type: Icon - sprite: Objects/Guns/Pistols/giskard.rsi + sprite: Objects/Weapons/Guns/Pistols/giskard.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/giskard.rsi + sprite: Objects/Weapons/Guns/Pistols/giskard.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -136,18 +136,18 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Pistols/hm_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/hm_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi state: icon - type: Item Size: 24 - sprite: Objects/Guns/Pistols/hm_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi - type: RangedWeapon - type: BoltActionBarrel caliber: Pistol @@ -160,13 +160,13 @@ maxAngle: 60 angleIncrease: 10 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/pistol.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/pistol_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Guns/MagIn/pistol_magin.ogg - soundMagEject: /Audio/Guns/MagOut/pistol_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -178,17 +178,17 @@ description: A heavy pistol of Ironhammer enforcers. components: - type: Sprite - sprite: Objects/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Magnum @@ -201,11 +201,11 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/hpistol.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/hpistol_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/hpistol_magin.ogg - soundMagEject: /Audio/Guns/MagOut/hpistol_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/hpistol_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -220,7 +220,7 @@ description: A rugged, robust operator handgun with inbuilt silencer. Chambered in caseless rifle ammunition, this time-tested handgun is your absolute choice if you need to take someone down silently, as it's deadly, produces no sound, and leaves no trace. components: - type: Sprite - sprite: Objects/Guns/Pistols/mandella.rsi + sprite: Objects/Weapons/Guns/Pistols/mandella.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -229,10 +229,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Pistols/mandella.rsi + sprite: Objects/Weapons/Guns/Pistols/mandella.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/mandella.rsi + sprite: Objects/Weapons/Guns/Pistols/mandella.rsi - type: RangedWeapon - type: MagazineBarrel caliber: ClRifle @@ -245,7 +245,7 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/silenced.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/silenced.ogg - type: entity name: mk 58 @@ -254,17 +254,17 @@ description: The NT Mk58 is a cheap, ubiquitous sidearm, that was produced by a NanoTrasen subsidiary. components: - type: Sprite - sprite: Objects/Guns/Pistols/mk58.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/mk58.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/mk58.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -286,17 +286,17 @@ description: The NT Mk58 is a cheap, ubiquitous sidearm, that was produced by a NanoTrasen subsidiary. components: - type: Sprite - sprite: Objects/Guns/Pistols/mk58_wood.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/mk58_wood.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/mk58_wood.rsi + sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -318,12 +318,12 @@ description: An experimental fully automatic pistol, designed as a middle ground between SMGs and Pistols. Primarily employed in CQC scenarios or as a civilian self defence tool. Takes both highcap pistol and smg mags. components: - type: Sprite - sprite: Objects/Guns/Pistols/molly.rsi + sprite: Objects/Weapons/Guns/Pistols/molly.rsi - type: Icon - sprite: Objects/Guns/Pistols/molly.rsi + sprite: Objects/Weapons/Guns/Pistols/molly.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/molly.rsi + sprite: Objects/Weapons/Guns/Pistols/molly.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -348,17 +348,17 @@ description: A popular "Frozen Star" machine pistol. This one has a two-round burst-fire mode and is chambered for .35 auto. It can use normal and high capacity magazines. components: - type: Sprite - sprite: Objects/Guns/Pistols/olivaw_civil.rsi + sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/olivaw_civil.rsi + sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/olivaw_civil.rsi + sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol @@ -381,12 +381,12 @@ description: A modern and reliable sidearm for the soldier in the field. Commonly issued as a sidearm to Ironhammer Operatives. components: - type: Sprite - sprite: Objects/Guns/Pistols/paco.rsi + sprite: Objects/Weapons/Guns/Pistols/paco.rsi - type: Icon - sprite: Objects/Guns/Pistols/paco.rsi + sprite: Objects/Weapons/Guns/Pistols/paco.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/paco.rsi + sprite: Objects/Weapons/Guns/Pistols/paco.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Pistol diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml index 4e810b071e..a2778f7e50 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml @@ -4,9 +4,9 @@ abstract: true components: - type: Hitscan - spriteName: Objects/Guns/Projectiles/laser.png - muzzleFlash: Objects/Guns/Projectiles/laser_muzzle.png - impactFlash: Objects/Guns/Projectiles/laser_impact.png + spriteName: Objects/Weapons/Guns/Projectiles/laser.png + muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png + impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png damage: 10 - type: entity @@ -15,9 +15,9 @@ abstract: true components: - type: Hitscan - spriteName: Objects/Guns/Projectiles/heavy_laser.png - muzzleFlash: Objects/Guns/Projectiles/heavy_laser_muzzle.png - impactFlash: Objects/Guns/Projectiles/heavy_laser_impact.png + spriteName: Objects/Weapons/Guns/Projectiles/heavy_laser.png + muzzleFlash: Objects/Weapons/Guns/Projectiles/heavy_laser_muzzle.png + impactFlash: Objects/Weapons/Guns/Projectiles/heavy_laser_impact.png damage: 30 - type: entity @@ -26,7 +26,7 @@ abstract: true components: - type: Hitscan - spriteName: Objects/Guns/Projectiles/xray.png - muzzleFlash: Objects/Guns/Projectiles/xray_muzzle.png - impactFlash: Objects/Guns/Projectiles/xray_impact.png + spriteName: Objects/Weapons/Guns/Projectiles/xray.png + muzzleFlash: Objects/Weapons/Guns/Projectiles/xray_muzzle.png + impactFlash: Objects/Weapons/Guns/Projectiles/xray_impact.png damage: 60 diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index d834a1e14d..4e810bdb1b 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -9,10 +9,10 @@ - type: Sprite netsync: false directional: false - sprite: Objects/Guns/Projectiles/bullet.rsi + sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi state: bullet - type: Icon - sprite: Objects/Guns/Projectiles/bullet.rsi + sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi state: bullet - type: Collidable hard: false @@ -28,7 +28,7 @@ - type: Physics edgeslide: false - type: Projectile - soundHit: /Audio/Guns/Hits/bullet_hit.ogg + soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg damages: Brute: 20 @@ -39,7 +39,7 @@ abstract: true components: - type: Projectile - soundHit: /Audio/Guns/Hits/snap.ogg + soundHit: /Audio/Weapons/Guns/Hits/snap.ogg damages: Brute: 10 - type: FlashProjectile @@ -72,7 +72,7 @@ abstract: true components: - type: Projectile - soundHit: /Audio/Guns/Hits/snap.ogg + soundHit: /Audio/Weapons/Guns/Hits/snap.ogg damages: Brute: 3 - type: StunnableProjectile @@ -88,7 +88,7 @@ ammoVelocity: 20 caliber: Energy - type: Projectile - soundHitSpecies: "/Audio/Guns/Hits/taser_hit.ogg" + soundHitSpecies: "/Audio/Weapons/Guns/Hits/taser_hit.ogg" damages: Heat: 5 - type: StunnableProjectile @@ -96,13 +96,13 @@ knockdownAmount: 5 - type: Sprite directional: false - sprite: Objects/Guns/Projectiles/spark.rsi + sprite: Objects/Weapons/Guns/Projectiles/spark.rsi color: "#ffff33" layers: - state: spark shader: unshaded - type: Icon - sprite: Objects/Guns/Projectiles/spark.rsi + sprite: Objects/Weapons/Guns/Projectiles/spark.rsi state: spark color: "#ffff33" - type: Collidable @@ -124,7 +124,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Projectiles/rocket.rsi + sprite: Objects/Weapons/Guns/Projectiles/rocket.rsi state: frag - type: ExplosiveProjectile - type: Projectile @@ -147,11 +147,11 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Projectiles/grenade.rsi + sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: Projectile deleteOnCollide: false - soundHit: /Audio/effects/gen_hit.ogg + soundHit: /Audio/Effects/gen_hit.ogg - type: StunnableProjectile paralyzeAmount: 8 @@ -163,7 +163,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Projectiles/grenade.rsi + sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: ExplosiveProjectile - type: Projectile @@ -182,11 +182,11 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Projectiles/grenade.rsi + sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: Projectile deleteOnCollide: false - soundHit: /Audio/effects/flash_bang.ogg + soundHit: /Audio/Effects/flash_bang.ogg - type: FlashProjectile range: 7 @@ -199,7 +199,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Projectiles/grenade.rsi + sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: ExplosiveProjectile - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml index 8e21794ba9..39bebd9785 100644 --- a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml @@ -18,7 +18,7 @@ description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. components: - type: Sprite - sprite: Objects/Guns/Revolvers/deckard.rsi + sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -28,10 +28,10 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Revolvers/deckard.rsi + sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: Item Size: 24 - sprite: Objects/Guns/Revolvers/deckard.rsi + sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: RangedWeapon - type: BoltActionBarrel currentSelector: Single @@ -41,9 +41,9 @@ caliber: Magnum capacity: 5 autoCycle: true - soundGunshot: /Audio/Guns/Gunshots/revolver.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -59,12 +59,12 @@ description: A rooty tooty point and shooty. components: - type: Sprite - sprite: Objects/Guns/Revolvers/inspector.rsi + sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: Icon - sprite: Objects/Guns/Revolvers/inspector.rsi + sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: Item Size: 24 - sprite: Objects/Guns/Revolvers/inspector.rsi + sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: RangedWeapon - type: RevolverBarrel currentSelector: Single @@ -73,10 +73,10 @@ fillPrototype: CartridgeMagnum caliber: Magnum capacity: 7 - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/revolver.ogg - soundEject: /Audio/Guns/MagOut/revolver_magout.ogg - soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEject: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: entity name: Mateba @@ -85,12 +85,12 @@ description: A rooty tooty point and shooty. components: - type: Sprite - sprite: Objects/Guns/Revolvers/mateba.rsi + sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Icon - sprite: Objects/Guns/Revolvers/mateba.rsi + sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Item Size: 24 - sprite: Objects/Guns/Revolvers/mateba.rsi + sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: RangedWeapon - type: RevolverBarrel currentSelector: Single @@ -99,7 +99,7 @@ fillPrototype: CartridgeMagnum caliber: Magnum capacity: 7 - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/revolver.ogg - soundEject: /Audio/Guns/MagOut/revolver_magout.ogg - soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEject: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index fb53c8bfc6..9b2ef63afd 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -22,13 +22,13 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 90 - soundGunshot: /Audio/Guns/Gunshots/batrifle.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/sf_rifle_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Guns/MagIn/batrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/batrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - type: entity name: AKMS @@ -37,17 +37,17 @@ description: Weapon of the oppressed, oppressors, and extremists of all flavours. This is a copy of an ancient semi-automatic rifle chambered for .30 Rifle. If it won't fire, percussive maintenance should get it working again. It is known for its easy maintenance, and low price. This gun is not in active military service anymore, but has become ubiquitous among criminals and insurgents. This is a high-quality copy, which has an automatic fire mode. components: - type: Sprite - sprite: Objects/Guns/Rifles/ak.rsi + sprite: Objects/Weapons/Guns/Rifles/ak.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/ak.rsi + sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/ak.rsi + sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: RangedWeapon - type: MagazineBarrel caliber: LRifle @@ -58,10 +58,10 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 90 - soundGunshot: /Audio/Guns/Gunshots/rifle2.ogg - soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -76,17 +76,17 @@ description: Weapon of the oppressed, oppressors, and extremists of all flavours. This is a copy of an ancient semi-automatic rifle chambered for .30 Rifle. If it won't fire, percussive maintenance should get it working again. It is known for its easy maintenance, and low price. This gun is not in active military service anymore, but has become ubiquitous among criminals and insurgents. This is a high-quality copy, which has an automatic fire mode. components: - type: Sprite - sprite: Objects/Guns/Rifles/black_ak.rsi + sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/black_ak.rsi + sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/black_ak.rsi + sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi - type: RangedWeapon - type: MagazineBarrel caliber: LRifle @@ -97,10 +97,10 @@ maxAngle: 60 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/rifle2.ogg - soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -115,7 +115,7 @@ description: The Z8 Bulldog is an older bullpup carbine model, made by Frozen Star. components: - type: Sprite - sprite: Objects/Guns/Rifles/carbine.rsi + sprite: Objects/Weapons/Guns/Rifles/carbine.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -124,10 +124,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/carbine.rsi + sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/carbine.rsi + sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: RangedWeapon - type: MagazineBarrel caliber: SRifle @@ -139,10 +139,10 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/batrifle.ogg - soundRack: /Audio/Guns/Cock/batrifle_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/batrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/batrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + soundRack: /Audio/Weapons/Guns/Cock/batrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -158,17 +158,17 @@ description: Dallas is a pulse-action air-cooled automatic assault rifle made by unknown manufacturer. This weapon is very rare, but deadly efficient. It's used by elite mercenaries, assassins or bald marines. components: - type: Sprite - sprite: Objects/Guns/Rifles/dallas.rsi + sprite: Objects/Weapons/Guns/Rifles/dallas.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/dallas.rsi + sprite: Objects/Weapons/Guns/Rifles/dallas.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/dallas.rsi + sprite: Objects/Weapons/Guns/Rifles/dallas.rsi - type: RangedWeapon - type: MagazineBarrel caliber: ClRifle @@ -180,10 +180,10 @@ maxAngle: 60 angleIncrease: 10 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/m41.ogg - soundRack: /Audio/Guns/Cock/m41_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/m41_reload.ogg - soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/m41.ogg + soundRack: /Audio/Weapons/Guns/Cock/m41_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/m41_reload.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: MagVisualizer2D @@ -198,7 +198,7 @@ description: The rugged STS-35 is a durable automatic weapon, popular on frontier worlds. Uses .30 Rifle rounds. This one is unmarked. components: - type: Sprite - sprite: Objects/Guns/Rifles/sts.rsi + sprite: Objects/Weapons/Guns/Rifles/sts.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -207,10 +207,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/sts.rsi + sprite: Objects/Weapons/Guns/Rifles/sts.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/sts.rsi + sprite: Objects/Weapons/Guns/Rifles/sts.rsi - type: RangedWeapon - type: MagazineBarrel caliber: LRifle @@ -221,10 +221,10 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/ltrifle.ogg - soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -240,7 +240,7 @@ description: This gun is a copy of a design from a country that no longer exists. It is still highly prized for its armor piercing capabilities. components: - type: Sprite - sprite: Objects/Guns/Rifles/vintorez.rsi + sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -249,10 +249,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/vintorez.rsi + sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/vintorez.rsi + sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi - type: RangedWeapon - type: MagazineBarrel caliber: SRifle @@ -279,7 +279,7 @@ description: A high end military grade assault rifle, designed as a modern ballistic infantry weapon. Primarily used by and produced for IH troops. components: - type: Sprite - sprite: Objects/Guns/Rifles/wintermute.rsi + sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -288,10 +288,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/wintermute.rsi + sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/wintermute.rsi + sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi - type: RangedWeapon - type: MagazineBarrel caliber: SRifle @@ -304,10 +304,10 @@ maxAngle: 45 angleIncrease: 15 angleDecay: 60 - soundGunshot: /Audio/Guns/Gunshots/ltrifle.ogg - soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg - soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg - soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml index 7088d4f227..25195f84a8 100644 --- a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -26,13 +26,13 @@ angleIncrease: 10 angleDecay: 60 magFillPrototype: MagazinePistolSmg - soundGunshot: /Audio/Guns/Gunshots/smg.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/smg_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Guns/MagIn/smg_magin.ogg - soundMagEject: /Audio/Guns/MagOut/smg_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/smg_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: entity name: Atreides @@ -41,7 +41,7 @@ description: Pla-ket-ket-ket-ket components: - type: Sprite - sprite: Objects/Guns/SMGs/atreides.rsi + sprite: Objects/Weapons/Guns/SMGs/atreides.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -50,10 +50,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/atreides.rsi + sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/atreides.rsi + sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic @@ -82,7 +82,7 @@ description: A rooty tooty point and shooty. components: - type: Sprite - sprite: Objects/Guns/SMGs/c20r.rsi + sprite: Objects/Weapons/Guns/SMGs/c20r.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -91,10 +91,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/c20r.rsi + sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/c20r.rsi + sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic @@ -125,7 +125,7 @@ description: An excellent fully automatic Heavy SMG. Rifled to take a larger caliber than a typical submachine gun, but unlike other heavy SMGs makes use of increased caliber to achieve excellent armor penetration capabilities. Suffers a bit less from poor recoil control and has worse than average fire rate. components: - type: Sprite - sprite: Objects/Guns/SMGs/drozd.rsi + sprite: Objects/Weapons/Guns/SMGs/drozd.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -134,10 +134,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/drozd.rsi + sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/drozd.rsi + sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: RangedWeapon - type: MagazineBarrel fireRate: 6 @@ -167,7 +167,7 @@ description: Pla-ket-ket-ket-ket components: - type: Sprite - sprite: Objects/Guns/SMGs/straylight.rsi + sprite: Objects/Weapons/Guns/SMGs/straylight.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -176,10 +176,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/straylight.rsi + sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/straylight.rsi + sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic @@ -205,7 +205,7 @@ description: A rooty tooty point and shooty. components: - type: Sprite - sprite: Objects/Guns/SMGs/wt550.rsi + sprite: Objects/Weapons/Guns/SMGs/wt550.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -218,10 +218,10 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/SMGs/wt550.rsi + sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/wt550.rsi + sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic @@ -246,7 +246,7 @@ description: A rooty tooty point and shooty. components: - type: Sprite - sprite: Objects/Guns/SMGs/zoric.rsi + sprite: Objects/Weapons/Guns/SMGs/zoric.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -255,10 +255,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/zoric.rsi + sprite: Objects/Weapons/Guns/SMGs/zoric.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/zoric.rsi + sprite: Objects/Weapons/Guns/SMGs/zoric.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic diff --git a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml index f311f652e4..b05c493337 100644 --- a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml @@ -24,9 +24,9 @@ maxAngle: 60 angleIncrease: 30 angleDecay: 30 - soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - type: entity name: Bojevic @@ -36,7 +36,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Shotguns/bojevic.rsi + sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -45,10 +45,10 @@ - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Shotguns/bojevic.rsi + sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi state: icon - type: Item - sprite: Objects/Guns/Shotguns/bojevic.rsi + sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi - type: RangedWeapon - type: MagazineBarrel currentSelector: Automatic @@ -59,13 +59,13 @@ magazineTypes: - Rifle magFillPrototype: MagazineShotgun - soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundRack: /Audio/Guns/Cock/smg_cock.ogg - soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg - soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg - soundMagInsert: /Audio/Guns/MagIn/smg_magin.ogg - soundMagEject: /Audio/Guns/MagOut/smg_magout.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundRack: /Audio/Weapons/Guns/Cock/smg_cock.ogg + soundBoltOpen: /Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + soundMagEject: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -82,17 +82,17 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Shotguns/db_shotgun.rsi + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Shotguns/db_shotgun.rsi + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi state: icon - type: Item - sprite: Objects/Guns/Shotguns/db_shotgun.rsi + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi state: icon - type: RangedWeapon - type: BoltActionBarrel @@ -108,11 +108,11 @@ angleIncrease: 30 angleDecay: 30 ammoSpreadRatio: 0.7 - soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg - sound_bolt_open: /Audio/Guns/Cock/shotgun_open.ogg - sound_bolt_closed: /Audio/Guns/Cock/shotgun_close.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + sound_bolt_open: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + sound_bolt_closed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D @@ -124,7 +124,7 @@ description: A Frozen Star pump-action shotgun. A marvel of engineering, this gun is often used by Ironhammer tactical units. Due to shorter than usual barrels, recoil kicks slightly harder. components: - type: Sprite - sprite: Objects/Guns/Shotguns/bull.rsi + sprite: Objects/Weapons/Guns/Shotguns/bull.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] @@ -132,9 +132,9 @@ map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] shader: unshaded - type: Icon - sprite: Objects/Guns/Shotguns/bull.rsi + sprite: Objects/Weapons/Guns/Shotguns/bull.rsi - type: Item - sprite: Objects/Guns/Shotguns/bull.rsi + sprite: Objects/Weapons/Guns/Shotguns/bull.rsi - type: RangedWeapon - type: PumpBarrel fireRate: 4.0 @@ -154,11 +154,11 @@ description: It is a next-generation Frozen Star shotgun intended as a cost-effective competitor to the aging NT "Regulator 1000". It has a semi-rifled lightweight full-length barrel which gives it exceptional accuracy with all types of ammunition, with a high-capacity magazine tube below it. components: - type: Sprite - sprite: Objects/Guns/Shotguns/gladstone.rsi + sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi - type: Icon - sprite: Objects/Guns/Shotguns/gladstone.rsi + sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi - type: Item - sprite: Objects/Guns/Shotguns/gladstone.rsi + sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi - type: RangedWeapon - type: PumpBarrel capacity: 9 @@ -171,11 +171,11 @@ description: Designed for close quarters combat, the Regulator is widely regarded as a weapon of choice for repelling boarders. Some may say that it's too old, but it actually proved itself useful. components: - type: Sprite - sprite: Objects/Guns/Shotguns/regulator.rsi + sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi - type: Icon - sprite: Objects/Guns/Shotguns/regulator.rsi + sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi - type: Item - sprite: Objects/Guns/Shotguns/regulator.rsi + sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi - type: RangedWeapon - type: PumpBarrel capacity: 7 @@ -188,11 +188,11 @@ description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. components: - type: Sprite - sprite: Objects/Guns/Shotguns/pump.rsi + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Icon - sprite: Objects/Guns/Shotguns/pump.rsi + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Item - sprite: Objects/Guns/Shotguns/pump.rsi + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: RangedWeapon - type: PumpBarrel capacity: 4 @@ -206,17 +206,17 @@ components: - type: Sprite netsync: false - sprite: Objects/Guns/Shotguns/sawn.rsi + sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] - state: bolt-closed map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Shotguns/sawn.rsi + sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi state: icon - type: Item - sprite: Objects/Guns/Shotguns/sawn.rsi + sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi state: icon - type: RangedWeapon - type: BoltActionBarrel @@ -231,11 +231,11 @@ maxAngle: 90 angleIncrease: 45 angleDecay: 30 - soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg - soundBoltOpen: /Audio/Guns/Cock/shotgun_open.ogg - soundBoltClosed: /Audio/Guns/Cock/shotgun_close.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + soundBoltOpen: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + soundBoltClosed: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - type: Appearance visuals: - type: BarrelBoltVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml index d72097857f..62b23cca22 100644 --- a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml @@ -28,9 +28,9 @@ maxAngle: 45 angleIncrease: 20 angleDecay: 15 - soundGunshot: /Audio/Guns/Gunshots/sniper.ogg - soundEmpty: /Audio/Guns/Empty/empty.ogg - soundInsert: /Audio/Guns/MagIn/bullet_insert.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: entity name: Kardashev-Mosin @@ -39,11 +39,11 @@ description: Weapon for hunting, or endless trench warfare. If you’re on a budget, it’s a darn good rifle for just about everything. components: - type: Sprite - sprite: Objects/Guns/Snipers/bolt_gun.rsi + sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi - type: Icon - sprite: Objects/Guns/Snipers/bolt_gun.rsi + sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi - type: Item - sprite: Objects/Guns/Snipers/bolt_gun.rsi + sprite: Objects/Weapons/Guns/Snipers/bolt_gun.rsi - type: RangedWeapon - type: BoltActionBarrel - type: Appearance @@ -57,9 +57,9 @@ description: Weapon for hunting, or endless trench warfare. If you’re on a budget, it’s a darn good rifle for just about everything. components: - type: Sprite - sprite: Objects/Guns/Snipers/bolt_gun_wood.rsi + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - type: Icon - sprite: Objects/Guns/Snipers/bolt_gun_wood.rsi + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - type: RangedWeapon - type: BoltActionBarrel - type: Appearance @@ -73,9 +73,9 @@ description: A portable anti-armour rifle, fitted with a scope, it was originally designed for use against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells. components: - type: Sprite - sprite: Objects/Guns/Snipers/heavy_sniper.rsi + sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi - type: Icon - sprite: Objects/Guns/Snipers/heavy_sniper.rsi + sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi - type: RangedWeapon - type: BoltActionBarrel caliber: AntiMaterial diff --git a/Resources/Prototypes/Entities/janitor.yml b/Resources/Prototypes/Entities/janitor.yml index 9e2116f7a0..5f5fbf172d 100644 --- a/Resources/Prototypes/Entities/janitor.yml +++ b/Resources/Prototypes/Entities/janitor.yml @@ -5,16 +5,16 @@ description: A mop that can't be stopped, viscera cleanup detail awaits. components: - type: Sprite - sprite: Objects/Janitorial/mop.rsi + sprite: Objects/Specific/Janitorial/mop.rsi state: mop - type: Icon - sprite: Objects/Janitorial/mop.rsi + sprite: Objects/Specific/Janitorial/mop.rsi state: mop - type: Item Size: 10 - sprite: Objects/Janitorial/mop.rsi + sprite: Objects/Specific/Janitorial/mop.rsi - type: Mop - type: Solution @@ -30,10 +30,10 @@ components: - type: Clickable - type: Sprite - texture: Objects/Janitorial/mopbucket.png + texture: Objects/Specific/Janitorial/mopbucket.png drawdepth: Objects - type: Icon - texture: Objects/Janitorial/mopbucket.png + texture: Objects/Specific/Janitorial/mopbucket.png - type: InteractionOutline - type: Bucket - type: LoopingSound @@ -63,10 +63,10 @@ components: - type: Clickable - type: Sprite - texture: Objects/Janitorial/bucket.png + texture: Objects/Specific/Janitorial/bucket.png drawdepth: Objects - type: Icon - texture: Objects/Janitorial/bucket.png + texture: Objects/Specific/Janitorial/bucket.png - type: Bucket - type: LoopingSound - type: Solution @@ -94,13 +94,13 @@ description: Caution! Wet Floor! components: - type: Sprite - sprite: Objects/Janitorial/wet_floor_sign.rsi + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi state: caution - type: Icon - sprite: Objects/Janitorial/wet_floor_sign.rsi + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi state: caution - type: Item - sprite: Objects/Janitorial/wet_floor_sign.rsi + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi diff --git a/Resources/Prototypes/Entities/kitchen.yml b/Resources/Prototypes/Entities/kitchen.yml index 3408dd30e8..30dc14f5f8 100644 --- a/Resources/Prototypes/Entities/kitchen.yml +++ b/Resources/Prototypes/Entities/kitchen.yml @@ -33,7 +33,7 @@ IsScrapingFloor: true - type: Sprite netsync: false - sprite: Objects/Kitchen/microwave.rsi + sprite: Constructible/Power/microwave.rsi drawdepth: Items layers: - state: mw0 @@ -43,5 +43,5 @@ map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"] - type: PowerReceiver - type: Icon - sprite: Objects/Kitchen/microwave.rsi + sprite: Constructible/Power/microwave.rsi state: mw0 diff --git a/Resources/Prototypes/Entities/potted_plants.yml b/Resources/Prototypes/Entities/potted_plants.yml index e5dfb75f38..15d1897563 100644 --- a/Resources/Prototypes/Entities/potted_plants.yml +++ b/Resources/Prototypes/Entities/potted_plants.yml @@ -6,10 +6,10 @@ - type: InteractionOutline - type: Collidable - type: Sprite - sprite: Objects/potted_plants.rsi + sprite: Constructible/Misc/potted_plants.rsi - type: Icon - sprite: Objects/potted_plants.rsi + sprite: Constructible/Misc/potted_plants.rsi - type: PottedPlantHide diff --git a/Resources/Prototypes/Entities/research.yml b/Resources/Prototypes/Entities/research.yml index 906505e89d..f523b62926 100644 --- a/Resources/Prototypes/Entities/research.yml +++ b/Resources/Prototypes/Entities/research.yml @@ -3,10 +3,10 @@ name: "R&D server" components: - type: Sprite - sprite: Buildings/research.rsi + sprite: Constructible/Power/server.rsi state: server - type: Icon - sprite: Buildings/research.rsi + sprite: Constructible/Power/server.rsi state: server - type: Clickable - type: InteractionOutline @@ -25,14 +25,14 @@ # We should make this abstract once there are actual point sources. components: - type: Sprite - sprite: Buildings/research.rsi + sprite: Constructible/Power/tdopler.rsi layers: - state: tdoppler-off - state: tdoppler shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] - type: Icon - sprite: Buildings/research.rsi + sprite: Constructible/Power/tdopler.rsi state: tdoppler - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml index 168d08c3a2..da357b070b 100644 --- a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml +++ b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml @@ -8,7 +8,6 @@ - type: MeleeWeaponAnimation id: bite - prototype: WeaponTGArc state: bite arcType: Poke length: 0.4 @@ -17,7 +16,6 @@ - type: MeleeWeaponAnimation id: claw - prototype: WeaponTGArc state: claw arcType: Slash length: 0.4 @@ -26,7 +24,6 @@ - type: MeleeWeaponAnimation id: disarm - prototype: WeaponTGArc state: disarm arcType: Poke length: 0.3 @@ -42,7 +39,6 @@ - type: MeleeWeaponAnimation id: kick - prototype: WeaponTGArc state: kick arcType: Poke length: 0.3 @@ -51,7 +47,6 @@ - type: MeleeWeaponAnimation id: punch - prototype: WeaponTGArc state: punch arcType: Poke length: 0.5 @@ -60,7 +55,6 @@ - type: MeleeWeaponAnimation id: smash - prototype: WeaponTGArc state: smash arcType: Poke length: 0.3 diff --git a/Resources/Prototypes/Shaders/Stencils.yml b/Resources/Prototypes/Shaders/Stencils.yml index 956f6032ed..e1a8bdf6bc 100644 --- a/Resources/Prototypes/Shaders/Stencils.yml +++ b/Resources/Prototypes/Shaders/Stencils.yml @@ -1,7 +1,7 @@ - type: shader id: StencilClear kind: source - path: "/Shaders/stencil_clear.swsl" + path: "/Textures/Shaders/stencil_clear.swsl" stencil: ref: 0 op: Replace @@ -10,7 +10,7 @@ - type: shader id: StencilMask kind: source - path: "/Shaders/stencil_mask.swsl" + path: "/Textures/Shaders/stencil_mask.swsl" stencil: ref: 1 op: Replace diff --git a/Resources/Prototypes/Shaders/cooldown.yml b/Resources/Prototypes/Shaders/cooldown.yml index 51da84e393..93cd65bc17 100644 --- a/Resources/Prototypes/Shaders/cooldown.yml +++ b/Resources/Prototypes/Shaders/cooldown.yml @@ -1,6 +1,6 @@ - type: shader id: CooldownAnimation kind: source - path: "/Shaders/cooldown.swsl" + path: "/Textures/Shaders/cooldown.swsl" params: progress: 0 diff --git a/Resources/Prototypes/Shaders/outline.yml b/Resources/Prototypes/Shaders/outline.yml index 0cb18fd8b7..07da8a976e 100644 --- a/Resources/Prototypes/Shaders/outline.yml +++ b/Resources/Prototypes/Shaders/outline.yml @@ -1,7 +1,7 @@ - type: shader id: SelectionOutline kind: source - path: "/Shaders/outline.swsl" + path: "/Textures/Shaders/outline.swsl" params: outline_width: 2 outline_color: "#FF000055" @@ -9,7 +9,7 @@ - type: shader id: SelectionOutlineInrange kind: source - path: "/Shaders/outline.swsl" + path: "/Textures/Shaders/outline.swsl" params: outline_width: 2 outline_color: "#00FF0055" diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml index b206811bc0..b02acfe811 100644 --- a/Resources/Prototypes/Shaders/shaders.yml +++ b/Resources/Prototypes/Shaders/shaders.yml @@ -1,14 +1,14 @@ - type: shader id: CircleMask kind: source - path: "/Shaders/circle_mask.swsl" + path: "/Textures/Shaders/circle_mask.swsl" - type: shader id: GradientCircleMask kind: source - path: "/Shaders/gradient_circle_mask.swsl" + path: "/Textures/Shaders/gradient_circle_mask.swsl" - type: shader id: FlashedEffect kind: source - path: "/Shaders/flashed_effect.swsl" + path: "/Textures/Shaders/flashed_effect.swsl" diff --git a/Resources/Prototypes/SoundCollections/body_fall.yml b/Resources/Prototypes/SoundCollections/body_fall.yml index c8e9863588..c8f7097d58 100644 --- a/Resources/Prototypes/SoundCollections/body_fall.yml +++ b/Resources/Prototypes/SoundCollections/body_fall.yml @@ -1,7 +1,7 @@ - type: soundCollection id: bodyfall files: - - /Audio/effects/bodyfall1.ogg - - /Audio/effects/bodyfall2.ogg - - /Audio/effects/bodyfall3.ogg - - /Audio/effects/bodyfall4.ogg + - /Audio/Effects/bodyfall1.ogg + - /Audio/Effects/bodyfall2.ogg + - /Audio/Effects/bodyfall3.ogg + - /Audio/Effects/bodyfall4.ogg diff --git a/Resources/Prototypes/SoundCollections/dice.yml b/Resources/Prototypes/SoundCollections/dice.yml index d4e195b413..6ae970bc91 100644 --- a/Resources/Prototypes/SoundCollections/dice.yml +++ b/Resources/Prototypes/SoundCollections/dice.yml @@ -1,10 +1,10 @@ - type: soundCollection id: dice files: - - /Audio/items/dice/dice1.ogg - - /Audio/items/dice/dice2.ogg - - /Audio/items/dice/dice3.ogg - - /Audio/items/dice/dice4.ogg - - /Audio/items/dice/dice5.ogg - - /Audio/items/dice/dice6.ogg - - /Audio/items/dice/dice7.ogg + - /Audio/Items/Dice/dice1.ogg + - /Audio/Items/Dice/dice2.ogg + - /Audio/Items/Dice/dice3.ogg + - /Audio/Items/Dice/dice4.ogg + - /Audio/Items/Dice/dice5.ogg + - /Audio/Items/Dice/dice6.ogg + - /Audio/Items/Dice/dice7.ogg diff --git a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml index 0ed88554ff..04e2a8641e 100644 --- a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml +++ b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml @@ -1,11 +1,11 @@ - type: soundCollection id: canOpenSounds files: - - /Audio/items/can_open1.ogg - - /Audio/items/can_open2.ogg - - /Audio/items/can_open3.ogg + - /Audio/Items/can_open1.ogg + - /Audio/Items/can_open2.ogg + - /Audio/Items/can_open3.ogg - type: soundCollection id: bottleOpenSounds files: - - /Audio/items/bottle_open1.ogg + - /Audio/Items/bottle_open1.ogg diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml index 2bd9e15045..8370198788 100644 --- a/Resources/Prototypes/SoundCollections/footsteps.yml +++ b/Resources/Prototypes/SoundCollections/footsteps.yml @@ -1,83 +1,83 @@ - type: soundCollection id: footstep_carpet files: - - /Audio/effects/footsteps/carpet1.ogg - - /Audio/effects/footsteps/carpet2.ogg - - /Audio/effects/footsteps/carpet3.ogg - - /Audio/effects/footsteps/carpet4.ogg - - /Audio/effects/footsteps/carpet5.ogg + - /Audio/Effects/Footsteps/carpet1.ogg + - /Audio/Effects/Footsteps/carpet2.ogg + - /Audio/Effects/Footsteps/carpet3.ogg + - /Audio/Effects/Footsteps/carpet4.ogg + - /Audio/Effects/Footsteps/carpet5.ogg - type: soundCollection id: footstep_wood files: - - /Audio/effects/footsteps/wood1.ogg - - /Audio/effects/footsteps/wood2.ogg - - /Audio/effects/footsteps/wood3.ogg - - /Audio/effects/footsteps/wood4.ogg - - /Audio/effects/footsteps/wood5.ogg + - /Audio/Effects/Footsteps/wood1.ogg + - /Audio/Effects/Footsteps/wood2.ogg + - /Audio/Effects/Footsteps/wood3.ogg + - /Audio/Effects/Footsteps/wood4.ogg + - /Audio/Effects/Footsteps/wood5.ogg - type: soundCollection id: footstep_catwalk files: - - /Audio/effects/footsteps/catwalk1.ogg - - /Audio/effects/footsteps/catwalk2.ogg - - /Audio/effects/footsteps/catwalk3.ogg - - /Audio/effects/footsteps/catwalk4.ogg - - /Audio/effects/footsteps/catwalk5.ogg + - /Audio/Effects/Footsteps/catwalk1.ogg + - /Audio/Effects/Footsteps/catwalk2.ogg + - /Audio/Effects/Footsteps/catwalk3.ogg + - /Audio/Effects/Footsteps/catwalk4.ogg + - /Audio/Effects/Footsteps/catwalk5.ogg - type: soundCollection id: footstep_floor files: - - /Audio/effects/footsteps/floor1.ogg - - /Audio/effects/footsteps/floor2.ogg - - /Audio/effects/footsteps/floor3.ogg - - /Audio/effects/footsteps/floor4.ogg - - /Audio/effects/footsteps/floor5.ogg + - /Audio/Effects/Footsteps/floor1.ogg + - /Audio/Effects/Footsteps/floor2.ogg + - /Audio/Effects/Footsteps/floor3.ogg + - /Audio/Effects/Footsteps/floor4.ogg + - /Audio/Effects/Footsteps/floor5.ogg - type: soundCollection id: footstep_hull files: - - /Audio/effects/footsteps/hull1.ogg - - /Audio/effects/footsteps/hull2.ogg - - /Audio/effects/footsteps/hull3.ogg - - /Audio/effects/footsteps/hull4.ogg - - /Audio/effects/footsteps/hull5.ogg + - /Audio/Effects/Footsteps/hull1.ogg + - /Audio/Effects/Footsteps/hull2.ogg + - /Audio/Effects/Footsteps/hull3.ogg + - /Audio/Effects/Footsteps/hull4.ogg + - /Audio/Effects/Footsteps/hull5.ogg - type: soundCollection id: footstep_plating files: - - /Audio/effects/footsteps/plating1.ogg - - /Audio/effects/footsteps/plating2.ogg - - /Audio/effects/footsteps/plating3.ogg - - /Audio/effects/footsteps/plating4.ogg - - /Audio/effects/footsteps/plating5.ogg + - /Audio/Effects/Footsteps/plating1.ogg + - /Audio/Effects/Footsteps/plating2.ogg + - /Audio/Effects/Footsteps/plating3.ogg + - /Audio/Effects/Footsteps/plating4.ogg + - /Audio/Effects/Footsteps/plating5.ogg - type: soundCollection id: footstep_tile files: - - /Audio/effects/footsteps/tile1.ogg - - /Audio/effects/footsteps/tile2.ogg - - /Audio/effects/footsteps/tile3.ogg - - /Audio/effects/footsteps/tile4.ogg - - /Audio/effects/footsteps/tile5.ogg + - /Audio/Effects/Footsteps/tile1.ogg + - /Audio/Effects/Footsteps/tile2.ogg + - /Audio/Effects/Footsteps/tile3.ogg + - /Audio/Effects/Footsteps/tile4.ogg + - /Audio/Effects/Footsteps/tile5.ogg - type: soundCollection id: footstep_clown files: - - /Audio/effects/footsteps/clownstep1.ogg - - /Audio/effects/footsteps/clownstep2.ogg + - /Audio/Effects/Footsteps/clownstep1.ogg + - /Audio/Effects/Footsteps/clownstep2.ogg - type: soundCollection id: footstep_heavy files: - - /Audio/effects/footsteps/suitstep1.ogg - - /Audio/effects/footsteps/suitstep2.ogg + - /Audio/Effects/Footsteps/suitstep1.ogg + - /Audio/Effects/Footsteps/suitstep2.ogg - type: soundCollection id: footstep_asteroid files: - - /Audio/effects/footsteps/asteroid1.ogg - - /Audio/effects/footsteps/asteroid2.ogg - - /Audio/effects/footsteps/asteroid3.ogg - - /Audio/effects/footsteps/asteroid4.ogg - - /Audio/effects/footsteps/asteroid5.ogg + - /Audio/Effects/Footsteps/asteroid1.ogg + - /Audio/Effects/Footsteps/asteroid2.ogg + - /Audio/Effects/Footsteps/asteroid3.ogg + - /Audio/Effects/Footsteps/asteroid4.ogg + - /Audio/Effects/Footsteps/asteroid5.ogg diff --git a/Resources/Prototypes/SoundCollections/glassbreak.yml b/Resources/Prototypes/SoundCollections/glassbreak.yml index 30bf2928e3..2e62ea1860 100644 --- a/Resources/Prototypes/SoundCollections/glassbreak.yml +++ b/Resources/Prototypes/SoundCollections/glassbreak.yml @@ -1,6 +1,6 @@ - type: soundCollection id: glassbreak files: - - /Audio/effects/glassbreak1.ogg - - /Audio/effects/glassbreak2.ogg - - /Audio/effects/glassbreak3.ogg + - /Audio/Effects/glassbreak1.ogg + - /Audio/Effects/glassbreak2.ogg + - /Audio/Effects/glassbreak3.ogg diff --git a/Resources/Prototypes/SoundCollections/keyboard.yml b/Resources/Prototypes/SoundCollections/keyboard.yml index ec26a28eb9..be077bc8fd 100644 --- a/Resources/Prototypes/SoundCollections/keyboard.yml +++ b/Resources/Prototypes/SoundCollections/keyboard.yml @@ -1,7 +1,7 @@ - type: soundCollection id: keyboard files: - - /Audio/machines/keyboard/keyboard1.ogg - - /Audio/machines/keyboard/keyboard2.ogg - - /Audio/machines/keyboard/keyboard3.ogg - - /Audio/machines/keyboard/keyboard4.ogg + - /Audio/Machines/Keyboard/keyboard1.ogg + - /Audio/Machines/Keyboard/keyboard2.ogg + - /Audio/Machines/Keyboard/keyboard3.ogg + - /Audio/Machines/Keyboard/keyboard4.ogg diff --git a/Resources/Prototypes/SoundCollections/sparks.yml b/Resources/Prototypes/SoundCollections/sparks.yml index 03e3bed669..ea27cb1190 100644 --- a/Resources/Prototypes/SoundCollections/sparks.yml +++ b/Resources/Prototypes/SoundCollections/sparks.yml @@ -1,7 +1,7 @@ - type: soundCollection id: sparks files: - - /Audio/effects/sparks1.ogg - - /Audio/effects/sparks2.ogg - - /Audio/effects/sparks3.ogg - - /Audio/effects/sparks4.ogg + - /Audio/Effects/sparks1.ogg + - /Audio/Effects/sparks2.ogg + - /Audio/Effects/sparks3.ogg + - /Audio/Effects/sparks4.ogg diff --git a/Resources/Prototypes/SoundCollections/tools.yml b/Resources/Prototypes/SoundCollections/tools.yml index fbb9647b3d..be6e049bb8 100644 --- a/Resources/Prototypes/SoundCollections/tools.yml +++ b/Resources/Prototypes/SoundCollections/tools.yml @@ -1,22 +1,22 @@ - type: soundCollection id: WelderOn files: - - /Audio/items/lighter1.ogg - - /Audio/items/lighter2.ogg + - /Audio/Items/lighter1.ogg + - /Audio/Items/lighter2.ogg - type: soundCollection id: WelderOff files: - - /Audio/effects/zzzt.ogg + - /Audio/Effects/zzzt.ogg - type: soundCollection id: Welder files: - - /Audio/items/welder.ogg - - /Audio/items/welder2.ogg + - /Audio/Items/welder.ogg + - /Audio/Items/welder2.ogg - type: soundCollection id: Screwdriver files: - - /Audio/items/screwdriver.ogg - - /Audio/items/screwdriver2.ogg + - /Audio/Items/screwdriver.ogg + - /Audio/Items/screwdriver2.ogg diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index a023e7f89b..4e06d3d85a 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -135,7 +135,7 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: footstep_floor + footstep_sounds: friction: 0.35 item_drop: FloorTileItemShowroom @@ -194,7 +194,7 @@ - type: tile name: floor_asteroid_sand display_name: Asteroid Floor - texture: asteroid_sand + texture: Asteroid/asteroid_sand base_turfs: - space is_subfloor: false @@ -205,7 +205,7 @@ - type: tile name: floor_asteroid_tile display_name: Asteroid Tile - texture: asteroid_tile + texture: Asteroid/asteroid_tile base_turfs: - space - underplating @@ -218,7 +218,7 @@ - type: tile name: floor_asteroid_coarse_sand0 display_name: Asteroid Coarse Sand 0 - texture: asteroid_coarse_sand0 + texture: Asteroid/asteroid_coarse_sand0 base_turfs: - space is_subfloor: false @@ -229,7 +229,7 @@ - type: tile name: floor_asteroid_coarse_sand1 display_name: Asteroid Coarse Sand 1 - texture: asteroid_coarse_sand1 + texture: Asteroid/asteroid_coarse_sand1 base_turfs: - space is_subfloor: false @@ -240,7 +240,7 @@ - type: tile name: floor_asteroid_coarse_sand2 display_name: Asteroid Coarse Sand 2 - texture: asteroid_coarse_sand2 + texture: Asteroid/asteroid_coarse_sand2 base_turfs: - space is_subfloor: false @@ -251,7 +251,7 @@ - type: tile name: floor_asteroid_coarse_sand_dug display_name: Asteroid Dug Coarse Sand - texture: asteroid_coarse_sand_dug + texture: Asteroid/asteroid_coarse_sand_dug base_turfs: - space is_subfloor: false diff --git a/Resources/Textures/Buildings/chemicals.rsi/meta.json b/Resources/Textures/Buildings/chemicals.rsi/meta.json deleted file mode 100644 index c411a78f7e..0000000000 --- a/Resources/Textures/Buildings/chemicals.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/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"booze_dispenser","directions":1,"delays":[[1.0]]},{"name":"dispenser","directions":1,"delays":[[1.0]]},{"name":"genesplicer_empty","directions":1,"delays":[[1.0]]},{"name":"genesplicer_loaded","directions":1,"delays":[[1.0]]},{"name":"genesplicer_screens","directions":1,"delays":[[0.4,0.4,0.4,0.4]]},{"name":"industrial_dispenser","directions":1,"delays":[[1.0]]},{"name":"mixer_empty","directions":1,"delays":[[1.0]]},{"name":"mixer_loaded","directions":1,"delays":[[1.0]]},{"name":"mixer_screens","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]},{"name":"mixer_splicer_screen_broken","directions":1,"delays":[[1.0]]},{"name":"soda_dispenser","directions":1,"delays":[[1.0]]}]} diff --git a/Resources/Textures/Buildings/crate.rsi/meta.json b/Resources/Textures/Buildings/crate.rsi/meta.json deleted file mode 100644 index 4afb51c966..0000000000 --- a/Resources/Textures/Buildings/crate.rsi/meta.json +++ /dev/null @@ -1,252 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "lock_locked", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "lock_off", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "lock_unlocked", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "sparking", - "select": [], - "flags": {}, - "directions": 1, - "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]] - }, - { - "name": "crate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "crate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "crate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "freezer", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "freezer_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "freezer_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrocrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrocrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrocrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrosecurecrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrosecurecrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "hydrosecurecrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "medicalcrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "medicalcrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "medicalcrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "o2crate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "o2crate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "o2crate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasmacrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasmacrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasmacrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasticcrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasticcrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "plasticcrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "radiationcrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "radiationcrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "radiationcrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "secgearcrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "secgearcrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "secgearcrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "securecrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "securecrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "securecrate_open", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "weaponcrate", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "weaponcrate_door", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "weaponcrate_open", - "select": [], - "flags": {}, - "directions": 1 - } - ] -} diff --git a/Resources/Textures/Buildings/plants.rsi/meta.json b/Resources/Textures/Buildings/plants.rsi/meta.json deleted file mode 100644 index 5bd4e26562..0000000000 --- a/Resources/Textures/Buildings/plants.rsi/meta.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "version": 1, - - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/plants.dmi and modified by Swept", - - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "plant_1", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_2", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_3", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_4", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_5", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_6", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_7", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_8", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_9", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_10", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_11", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_12", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_13", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_14", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, - { - "name": "plant_15", - "select": [], - "flags": {}, - "directions": 1, - "delays": [] - }, -] -} - - - - - diff --git a/Resources/Textures/Buildings/plants.rsi/plant_1.png b/Resources/Textures/Buildings/plants.rsi/plant_1.png deleted file mode 100644 index b54ab40685..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_1.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_10.png b/Resources/Textures/Buildings/plants.rsi/plant_10.png deleted file mode 100644 index 8791db6082..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_10.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_11.png b/Resources/Textures/Buildings/plants.rsi/plant_11.png deleted file mode 100644 index 694b8983b2..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_11.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_12.png b/Resources/Textures/Buildings/plants.rsi/plant_12.png deleted file mode 100644 index ada681a748..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_12.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_13.png b/Resources/Textures/Buildings/plants.rsi/plant_13.png deleted file mode 100644 index 3192f154b8..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_13.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_14.png b/Resources/Textures/Buildings/plants.rsi/plant_14.png deleted file mode 100644 index 2818d3dcf3..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_14.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_15.png b/Resources/Textures/Buildings/plants.rsi/plant_15.png deleted file mode 100644 index 3d6c3f8700..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_15.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_2.png b/Resources/Textures/Buildings/plants.rsi/plant_2.png deleted file mode 100644 index 74d35c80a0..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_2.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_3.png b/Resources/Textures/Buildings/plants.rsi/plant_3.png deleted file mode 100644 index d9049ac5f5..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_3.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_4.png b/Resources/Textures/Buildings/plants.rsi/plant_4.png deleted file mode 100644 index ae64a1559c..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_4.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_5.png b/Resources/Textures/Buildings/plants.rsi/plant_5.png deleted file mode 100644 index a60da141b2..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_5.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_6.png b/Resources/Textures/Buildings/plants.rsi/plant_6.png deleted file mode 100644 index 81d4d49610..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_6.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_7.png b/Resources/Textures/Buildings/plants.rsi/plant_7.png deleted file mode 100644 index 6d334b3c6a..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_7.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_8.png b/Resources/Textures/Buildings/plants.rsi/plant_8.png deleted file mode 100644 index d78be07e14..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_8.png and /dev/null differ diff --git a/Resources/Textures/Buildings/plants.rsi/plant_9.png b/Resources/Textures/Buildings/plants.rsi/plant_9.png deleted file mode 100644 index ba5a910c47..0000000000 Binary files a/Resources/Textures/Buildings/plants.rsi/plant_9.png and /dev/null differ diff --git a/Resources/Textures/Clothing/backpacks.rsi/backpack-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/backpack-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/backpack-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/backpack-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/backpack-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/backpack-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/backpack.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/backpack.png rename to Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/backpack.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json new file mode 100644 index 0000000000..28c9ebe555 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "backpack", + "directions": 1 + }, + { + "name": "backpack-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "backpack-inhand-left", + "directions": 4 + }, + { + "name": "backpack-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/captain-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/captain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/captain-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/captain-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/captain-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/captain-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/captain.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/captain.png rename to Resources/Textures/Clothing/Back/Backpacks/captain.rsi/captain.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json new file mode 100644 index 0000000000..2e63d7d679 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "captain-inhand-right", + "directions": 4 + }, + { + "name": "captain", + "directions": 1 + }, + { + "name": "captain-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "captain-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/clown-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/clown-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/clown-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/clown-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/clown-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/clown-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/clown.png b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/clown.png rename to Resources/Textures/Clothing/Back/Backpacks/clown.rsi/clown.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json new file mode 100644 index 0000000000..58102b39ac --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "clown-inhand-right", + "directions": 4 + }, + { + "name": "clown", + "directions": 1 + }, + { + "name": "clown-inhand-left", + "directions": 4 + }, + { + "name": "clown-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/engineering-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/engineering-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/engineering-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/engineering-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/engineering-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/engineering-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/engineering.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/engineering.png rename to Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/engineering.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json new file mode 100644 index 0000000000..09fa110b6e --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "engineering", + "directions": 1 + }, + { + "name": "engineering-inhand-left", + "directions": 4 + }, + { + "name": "engineering-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "engineering-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-broken-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-broken-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-broken-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-broken-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-broken.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-broken.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-broken.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-broken.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding-unlit.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-unlit.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding-unlit.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-unlit.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/holding.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/holding.png rename to Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json new file mode 100644 index 0000000000..f4de573b6a --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "holding-equipped-BACKPACK", + "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 + ] + ] + }, + { + "name": "holding-inhand-right", + "directions": 4 + }, + { + "name": "holding-broken", + "directions": 1 + }, + { + "name": "holding", + "directions": 1, + "delays": [[ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ]] + }, + { + "name": "holding-unlit", + "directions": 1, + "delays": [[ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ]] + }, + { + "name": "holding-broken-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "holding-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/medical-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/medical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/medical-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/medical-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/medical-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/medical-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/medical.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/medical.png rename to Resources/Textures/Clothing/Back/Backpacks/medical.rsi/medical.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json new file mode 100644 index 0000000000..d62196bd26 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "medical-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "medical", + "directions": 1 + }, + { + "name": "medical-inhand-left", + "directions": 4 + }, + { + "name": "medical-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json new file mode 100644 index 0000000000..73c20c8317 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "security-inhand-left", + "directions": 4 + }, + { + "name": "security-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "security", + "directions": 1 + }, + { + "name": "security-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/security-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/security-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/security-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/security-inhand-left.png rename to Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-inhand-left.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/security-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/security-inhand-right.png rename to Resources/Textures/Clothing/Back/Backpacks/security.rsi/security-inhand-right.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/security.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/security.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/security.png rename to Resources/Textures/Clothing/Back/Backpacks/security.rsi/security.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-black.png b/Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier-black.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-black.png rename to Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier-black.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier.png b/Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier.png rename to Resources/Textures/Clothing/Back/Couriers/courier.rsi/courier.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier.rsi/meta.json similarity index 59% rename from Resources/Textures/Effects/weapons/arcs.rsi/meta.json rename to Resources/Textures/Clothing/Back/Couriers/courier.rsi/meta.json index 86a1ea6013..5a48a51c34 100644 --- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Couriers/courier.rsi/meta.json @@ -6,15 +6,15 @@ }, "states": [ { - "name": "spear", + "name": "courier-black", "directions": 1 }, { - "name": "slash", - "directions": 1 + "name": "courier-equipped-BACKPACK", + "directions": 4 }, { - "name": "fist", + "name": "courier", "directions": 1 } ] diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-captain-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/courier-captain-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-captain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/courier-captain-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-captain.png b/Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/courier-captain.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-captain.png rename to Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/courier-captain.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/meta.json new file mode 100644 index 0000000000..269b909cfa --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_captain.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-captain-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "courier-captain", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-chemistry-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/courier-chemistry-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-chemistry-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/courier-chemistry-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-chemistry.png b/Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/courier-chemistry.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-chemistry.png rename to Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/courier-chemistry.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/meta.json new file mode 100644 index 0000000000..6bbd0dc2d2 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_chemistry.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-chemistry", + "directions": 1 + }, + { + "name": "courier-chemistry-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-engineering-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/courier-engineering-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-engineering-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/courier-engineering-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-engineering.png b/Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/courier-engineering.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-engineering.png rename to Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/courier-engineering.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/meta.json new file mode 100644 index 0000000000..b62916b65c --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_engineering.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-engineering", + "directions": 1 + }, + { + "name": "courier-engineering-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-hydroponics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/courier-hydroponics-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-hydroponics-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/courier-hydroponics-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-hydroponics.png b/Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/courier-hydroponics.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-hydroponics.png rename to Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/courier-hydroponics.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/meta.json new file mode 100644 index 0000000000..4474ce28a9 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_hydroponics.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-hydroponics", + "directions": 1 + }, + { + "name": "courier-hydroponics-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-medical-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/courier-medical-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-medical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/courier-medical-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-medical.png b/Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/courier-medical.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-medical.png rename to Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/courier-medical.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/meta.json new file mode 100644 index 0000000000..0f4a220b06 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_medical.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-medical-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "courier-medical", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-science-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/courier-science-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-science-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/courier-science-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-science.png b/Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/courier-science.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-science.png rename to Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/courier-science.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/meta.json new file mode 100644 index 0000000000..7b0c7dd7f8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_science.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-science-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "courier-science", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-security-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/courier-security-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-security-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/courier-security-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-security.png b/Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/courier-security.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-security.png rename to Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/courier-security.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/meta.json new file mode 100644 index 0000000000..69d0af205c --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_security.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-security-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "courier-security", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-virology-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/courier-virology-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-virology-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/courier-virology-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/courier-virology.png b/Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/courier-virology.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/courier-virology.png rename to Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/courier-virology.png diff --git a/Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/meta.json new file mode 100644 index 0000000000..18788305e4 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Couriers/courier_virology.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "courier-virology", + "directions": 1 + }, + { + "name": "courier-virology-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json new file mode 100644 index 0000000000..3d3e0fd83e --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json new file mode 100644 index 0000000000..5c36b9da60 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-captain-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-captain", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-captain-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-captain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-captain.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-captain.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json new file mode 100644 index 0000000000..d20399567e --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-chemistry-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-chemistry", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-chemistry-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-chemistry-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-chemistry.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-chemistry.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json new file mode 100644 index 0000000000..2f47544f5a --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-engineering-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-engineering", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-engineering-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-engineering-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-engineering.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-engineering.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json new file mode 100644 index 0000000000..541db6f2dc --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-genetics-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-genetics", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-genetics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-genetics-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-genetics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-genetics.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json new file mode 100644 index 0000000000..dc674418b9 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-hydroponics-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-hydroponics", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-hydroponics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-hydroponics-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-hydroponics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-hydroponics.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json new file mode 100644 index 0000000000..62340a94b0 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-medical-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-medical", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-medical-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-medical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-medical.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-medical.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json new file mode 100644 index 0000000000..8c4a68e1f8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-science", + "directions": 1 + }, + { + "name": "satchel-science-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-science-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-science-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-science.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-science.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json new file mode 100644 index 0000000000..01776a4c20 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-security-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "satchel-security", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-security-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-security-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-security.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-security.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json new file mode 100644 index 0000000000..a29abae487 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "satchel-virology", + "directions": 1 + }, + { + "name": "satchel-virology-equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-virology-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-virology-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/backpacks.rsi/satchel-virology.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png similarity index 100% rename from Resources/Textures/Clothing/backpacks.rsi/satchel-virology.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png diff --git a/Resources/Textures/Clothing/Belts/belt_utility.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/belt_utility.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belts/belt_utility.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Belt/belt_utility.rsi/equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belts/belt_utility.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_utility.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Belts/belt_utility.rsi/meta.json rename to Resources/Textures/Clothing/Belt/belt_utility.rsi/meta.json diff --git a/Resources/Textures/Clothing/Belts/belt_utility.rsi/utilitybelt.png b/Resources/Textures/Clothing/Belt/belt_utility.rsi/utilitybelt.png similarity index 100% rename from Resources/Textures/Clothing/Belts/belt_utility.rsi/utilitybelt.png rename to Resources/Textures/Clothing/Belt/belt_utility.rsi/utilitybelt.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/assigned.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/assigned.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/assigned.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/assigned.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/default-inhand-left.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/default-inhand-left.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-left.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/default-inhand-right.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/default-inhand-right.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-right.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/default.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/default.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/default.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/default.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/gold-inhand-left.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/gold-inhand-left.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-left.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/gold-inhand-right.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/gold-inhand-right.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-right.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/gold.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/gold.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/gold.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/gold.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idassistant.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idassistant.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idassistant.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idassistant.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idbartender.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idbartender.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idbartender.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idbartender.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idcaptain.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idcaptain.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idcaptain.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idcaptain.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idcargotechnician.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idcargotechnician.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idcargotechnician.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idcentcom.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idcentcom.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idcentcom.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idcentcom.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefengineer.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idchiefengineer.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefengineer.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefmedicalofficer.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idchiefmedicalofficer.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefmedicalofficer.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idclown.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idclown.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idclown.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idclown.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idcook.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idcook.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idcook.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idcook.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofpersonnel.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idheadofpersonnel.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofpersonnel.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofsecurity.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idheadofsecurity.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofsecurity.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idjanitor.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idjanitor.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idjanitor.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idjanitor.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idmedicaldoctor.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idmedicaldoctor.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idmedicaldoctor.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idresearchdirector.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idresearchdirector.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idresearchdirector.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idscientist.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idscientist.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idscientist.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idscientist.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idsecurityofficer.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idsecurityofficer.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idsecurityofficer.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/idstationengineer.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/idstationengineer.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/idstationengineer.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/idstationengineer.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/meta.json b/Resources/Textures/Clothing/Belt/id_cards.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/meta.json rename to Resources/Textures/Clothing/Belt/id_cards.rsi/meta.json diff --git a/Resources/Textures/Clothing/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/silver-inhand-left.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-left.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/silver-inhand-right.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-right.png diff --git a/Resources/Textures/Clothing/id_cards.rsi/silver.png b/Resources/Textures/Clothing/Belt/id_cards.rsi/silver.png similarity index 100% rename from Resources/Textures/Clothing/id_cards.rsi/silver.png rename to Resources/Textures/Clothing/Belt/id_cards.rsi/silver.png diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/suspenders.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Belt/suspenders.rsi/equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png b/Resources/Textures/Clothing/Belt/suspenders.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png rename to Resources/Textures/Clothing/Belt/suspenders.rsi/icon.png diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json b/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json rename to Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json new file mode 100644 index 0000000000..19ca43cbbb --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetNT-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetNT-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetNT-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json new file mode 100644 index 0000000000..d8b9f8e973 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetUSA-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetUSA-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetUSA-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json new file mode 100644 index 0000000000..082703043b --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetblack-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetblack-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetblack-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json new file mode 100644 index 0000000000..f41c32d33a --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetblue-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetblue-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetblue-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json new file mode 100644 index 0000000000..b0399b3c5d --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetbrown-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetbrown-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetbrown-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json new file mode 100644 index 0000000000..c134ea482b --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetcaptain-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcaptain-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcaptain-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json new file mode 100644 index 0000000000..90e4c72b3c --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetce-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetce-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetce-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json new file mode 100644 index 0000000000..dfeb2b5417 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetcentcom-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcentcom-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcentcom-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json new file mode 100644 index 0000000000..b85d02319d --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetclown-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/sheetclown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/sheetclown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json new file mode 100644 index 0000000000..da738189dc --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetcmo-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcmo-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcmo-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json new file mode 100644 index 0000000000..4085e1b752 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json @@ -0,0 +1,109 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetcosmos-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "sheetcosmos-inhand-left", + "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 + ] + ] + }, + { + "name": "sheetcosmos-inhand-right", + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json new file mode 100644 index 0000000000..1f927071f8 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetcult-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ] + ] + }, + { + "name": "sheetcult-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetcult-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json new file mode 100644 index 0000000000..fadb56b0b2 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetgreen-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetgreen-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetgreen-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json new file mode 100644 index 0000000000..aec4baf13f --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetgrey-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetgrey-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetgrey-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json new file mode 100644 index 0000000000..cc1bc3fb16 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheethop-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheethop-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheethop-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json new file mode 100644 index 0000000000..8cf217b195 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheethos-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheethos-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheethos-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json new file mode 100644 index 0000000000..5825584df9 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetian-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetian-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetian-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json new file mode 100644 index 0000000000..f44a801c0f --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetmedical-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetmedical-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetmedical-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json new file mode 100644 index 0000000000..885b1ca01e --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetmime-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetmime-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetmime-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json new file mode 100644 index 0000000000..7058cbdb04 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetorange-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetorange-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetorange-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json new file mode 100644 index 0000000000..0b3477c875 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetpurple-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetpurple-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetpurple-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json new file mode 100644 index 0000000000..bd25887f5b --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetqm-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetqm-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetqm-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json new file mode 100644 index 0000000000..c1c91fa82a --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetrainbow-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetrainbow-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetrainbow-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json new file mode 100644 index 0000000000..f0cd42d9bd --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetrd-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetrd-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetrd-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json new file mode 100644 index 0000000000..3f5703ef18 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetred-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetred-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetred-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json new file mode 100644 index 0000000000..a9baee05cf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetsyndie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetsyndie-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetsyndie-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json new file mode 100644 index 0000000000..ad073f3c38 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetwhite-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetwhite-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetwhite-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json new file mode 100644 index 0000000000..c6f3cf5818 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetwiz-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ], + [ + 0.3, + 0.2, + 0.3, + 0.2 + ] + ] + }, + { + "name": "sheetwiz-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetwiz-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json new file mode 100644 index 0000000000..4d2597c8a7 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "sheetyellow-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetyellow-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sheetyellow-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png rename to Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-right.png diff --git a/Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/capcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/capcloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json new file mode 100644 index 0000000000..5d9600b00c --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "capcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "capcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cecloak.png b/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cecloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json new file mode 100644 index 0000000000..8357eba499 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cecloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cecloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} + diff --git a/Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cmocloak.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cmocloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json new file mode 100644 index 0000000000..3ade071e01 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cmocloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cmocloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/heraldcloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json new file mode 100644 index 0000000000..6666fef9f8 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "heraldcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "heraldcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/hopcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hopcloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json new file mode 100644 index 0000000000..e1419bef8c --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hopcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hopcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} + diff --git a/Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/hoscloak.png b/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hoscloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json new file mode 100644 index 0000000000..c130b066cf --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hoscloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hoscloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json new file mode 100644 index 0000000000..057ccf70e8 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "qmcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "qmcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/qmcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/qmcloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json new file mode 100644 index 0000000000..fcc4c9f9d8 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rdcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rdcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/rdcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/rdcloak.png rename to Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak.png diff --git a/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json new file mode 100644 index 0000000000..cf0bb40cae --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "stripedbluescarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedbluescarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png b/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png rename to Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf.png diff --git a/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json new file mode 100644 index 0000000000..f7268a2ee9 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "stripedgreenscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedgreenscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png b/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png rename to Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf.png diff --git a/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json new file mode 100644 index 0000000000..5130125131 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "stripedredscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedredscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png b/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stripedredscarf.png rename to Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf.png diff --git a/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json new file mode 100644 index 0000000000..ce2264b686 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "zebrascarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "zebrascarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf.png b/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/zebrascarf.png rename to Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf.png diff --git a/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png b/Resources/Textures/Clothing/Neck/bling.rsi/bling-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/bling.rsi/bling-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/bling.png b/Resources/Textures/Clothing/Neck/bling.rsi/bling.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/bling.png rename to Resources/Textures/Clothing/Neck/bling.rsi/bling.png diff --git a/Resources/Textures/Clothing/Neck/bling.rsi/meta.json b/Resources/Textures/Clothing/Neck/bling.rsi/meta.json new file mode 100644 index 0000000000..076ab3df21 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/bling.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "bling-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "bling", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/dettie.rsi/dettie-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/dettie.rsi/dettie-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/dettie.png b/Resources/Textures/Clothing/Neck/dettie.rsi/dettie.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/dettie.png rename to Resources/Textures/Clothing/Neck/dettie.rsi/dettie.png diff --git a/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json b/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json new file mode 100644 index 0000000000..b64be4b119 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "dettie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "dettie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_off.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off.png diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-left.png diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-right.png diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on.png b/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/headphones_on.png rename to Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on.png diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json b/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json new file mode 100644 index 0000000000..b3ab764332 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json @@ -0,0 +1,125 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "headphones_on-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "headphones_off-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_off", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "headphones_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json new file mode 100644 index 0000000000..a105dba279 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "redtie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "redtie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/redtie.rsi/redtie-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/redtie.rsi/redtie-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/redtie.png b/Resources/Textures/Clothing/Neck/redtie.rsi/redtie.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/redtie.png rename to Resources/Textures/Clothing/Neck/redtie.rsi/redtie.png diff --git a/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json b/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json new file mode 100644 index 0000000000..201efa4641 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CCBYNA3", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "stethoscope-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stethoscope", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png b/Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png rename to Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope.png b/Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope.png similarity index 100% rename from Resources/Textures/Clothing/neck.rsi/stethoscope.png rename to Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope.png diff --git a/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..996b51b9ae Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/icon.png new file mode 100644 index 0000000000..c19f9ee4f1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-left.png new file mode 100644 index 0000000000..efd146b02c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-right.png new file mode 100644 index 0000000000..5627783100 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/meta.json new file mode 100644 index 0000000000..117a2241ce --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/ghost_costume.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} diff --git a/Resources/Textures/Clothing/armorvest.png b/Resources/Textures/Clothing/armorvest.png deleted file mode 100644 index a3eba1db20..0000000000 Binary files a/Resources/Textures/Clothing/armorvest.png and /dev/null differ diff --git a/Resources/Textures/Clothing/backpacks.rsi/meta.json b/Resources/Textures/Clothing/backpacks.rsi/meta.json deleted file mode 100644 index 945bc4034c..0000000000 --- a/Resources/Textures/Clothing/backpacks.rsi/meta.json +++ /dev/null @@ -1,399 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "engineering", - "directions": 1 - }, - { - "name": "engineering-inhand-left", - "directions": 4 - }, - { - "name": "satchel-hydroponics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-science", - "directions": 1 - }, - { - "name": "satchel-engineering-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-black", - "directions": 1 - }, - { - "name": "courier-science-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "engineering", - "directions": 1 - }, - { - "name": "engineering-inhand-left", - "directions": 4 - }, - { - "name": "satchel-hydroponics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-science", - "directions": 1 - }, - { - "name": "satchel-engineering-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-black", - "directions": 1 - }, - { - "name": "courier-science-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "engineering", - "directions": 1 - }, - { - "name": "engineering-inhand-left", - "directions": 4 - }, - { - "name": "satchel-hydroponics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-science", - "directions": 1 - }, - { - "name": "satchel-engineering-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-black", - "directions": 1 - }, - { - "name": "courier-science-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-security-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "medical-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-chemistry-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "holding-equipped-BACKPACK", - "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 - ] - ] - }, - { - "name": "satchel-genetics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "security-inhand-left", - "directions": 4 - }, - { - "name": "courier-security-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "clown-inhand-right", - "directions": 4 - }, - { - "name": "courier-virology", - "directions": 1 - }, - { - "name": "security-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "medical", - "directions": 1 - }, - { - "name": "medical-inhand-left", - "directions": 4 - }, - { - "name": "courier-captain-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-chemistry", - "directions": 1 - }, - { - "name": "captain-inhand-right", - "directions": 4 - }, - { - "name": "courier-engineering", - "directions": 1 - }, - { - "name": "security", - "directions": 1 - }, - { - "name": "holding-inhand-right", - "directions": 4 - }, - { - "name": "satchel-captain-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-medical-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-security", - "directions": 1 - }, - { - "name": "courier-hydroponics", - "directions": 1 - }, - { - "name": "holding-broken", - "directions": 1 - }, - { - "name": "backpack", - "directions": 1 - }, - { - "name": "satchel-captain", - "directions": 1 - }, - { - "name": "backpack-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "holding", - "directions": 1, - "delays": [[ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ]] - }, - { - "name": "holding-unlit", - "directions": 1, - "delays": [[ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ]] - }, - { - "name": "courier-virology-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-hydroponics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "security-inhand-right", - "directions": 4 - }, - { - "name": "medical-inhand-right", - "directions": 4 - }, - { - "name": "courier-security", - "directions": 1 - }, - { - "name": "satchel", - "directions": 1 - }, - { - "name": "engineering-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "clown", - "directions": 1 - }, - { - "name": "satchel-virology", - "directions": 1 - }, - { - "name": "courier-medical", - "directions": 1 - }, - { - "name": "satchel-hydroponics", - "directions": 1 - }, - { - "name": "captain", - "directions": 1 - }, - { - "name": "courier-chemistry", - "directions": 1 - }, - { - "name": "captain-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-medical-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "backpack-inhand-left", - "directions": 4 - }, - { - "name": "satchel-science-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "holding-broken-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-engineering", - "directions": 1 - }, - { - "name": "courier-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "backpack-inhand-right", - "directions": 4 - }, - { - "name": "captain-inhand-left", - "directions": 4 - }, - { - "name": "courier-chemistry-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "engineering-inhand-right", - "directions": 4 - }, - { - "name": "satchel-medical", - "directions": 1 - }, - { - "name": "satchel-virology-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "courier-captain", - "directions": 1 - }, - { - "name": "courier", - "directions": 1 - }, - { - "name": "courier-science", - "directions": 1 - }, - { - "name": "courier-engineering-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-genetics", - "directions": 1 - }, - { - "name": "clown-inhand-left", - "directions": 4 - }, - { - "name": "clown-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "holding-inhand-left", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/belt_utility.png b/Resources/Textures/Clothing/belt_utility.png deleted file mode 100644 index d054a40fab..0000000000 Binary files a/Resources/Textures/Clothing/belt_utility.png and /dev/null differ diff --git a/Resources/Textures/Clothing/cloak.rsi/meta.json b/Resources/Textures/Clothing/cloak.rsi/meta.json deleted file mode 100644 index 651d692e7c..0000000000 --- a/Resources/Textures/Clothing/cloak.rsi/meta.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "capcloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "cecloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "cmocloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "hopcloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "hoscloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "qmcloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "rdcloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "capcloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "cecloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "cmocloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "hopcloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "hoscloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "qmcloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "rdcloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "heraldcloak", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "heraldcloak-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Clothing/ears_headset.png b/Resources/Textures/Clothing/ears_headset.png deleted file mode 100644 index 0471f23d63..0000000000 Binary files a/Resources/Textures/Clothing/ears_headset.png and /dev/null differ diff --git a/Resources/Textures/Clothing/glasses_meson.png b/Resources/Textures/Clothing/glasses_meson.png deleted file mode 100644 index 481e50d0f6..0000000000 Binary files a/Resources/Textures/Clothing/glasses_meson.png and /dev/null differ diff --git a/Resources/Textures/Clothing/gloves_yellow.png b/Resources/Textures/Clothing/gloves_yellow.png deleted file mode 100644 index 54e02be284..0000000000 Binary files a/Resources/Textures/Clothing/gloves_yellow.png and /dev/null differ diff --git a/Resources/Textures/Clothing/helmet_sec.png b/Resources/Textures/Clothing/helmet_sec.png deleted file mode 100644 index a876b82080..0000000000 Binary files a/Resources/Textures/Clothing/helmet_sec.png and /dev/null differ diff --git a/Resources/Textures/Clothing/neck.rsi/meta.json b/Resources/Textures/Clothing/neck.rsi/meta.json deleted file mode 100644 index 2f4e6fc712..0000000000 --- a/Resources/Textures/Clothing/neck.rsi/meta.json +++ /dev/null @@ -1,1939 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CCBYNA3", - "copyright": "https://github.com/tgstation/tgstation", - "states": [ - { - "name": "sheetNT-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetUSA-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblack-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblue-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetbrown-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcaptain-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetce-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcentcom-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetclown-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcmo-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcosmos-equipped-NECK", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "sheetcult-equipped-NECK", - "directions": 4, - "delays": [ - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ] - ] - }, - { - "name": "sheetgreen-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetgrey-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethop-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethos-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetian-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmedical-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmime-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetorange-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetpurple-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetqm-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrainbow-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrd-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetred-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetsyndie-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwhite-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwiz-equipped-NECK", - "directions": 4, - "delays": [ - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ], - [ - 0.3, - 0.2, - 0.3, - 0.2 - ] - ] - }, - { - "name": "sheetyellow-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetNT-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetUSA-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblack-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblue-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetbrown-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcaptain-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetce-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcentcom-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcmo-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcosmos-inhand-left", - "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 - ] - ] - }, - { - "name": "sheetcult-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetgreen-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetgrey-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethop-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethos-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetian-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmedical-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmime-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetorange-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetpurple-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetqm-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrainbow-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrd-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetred-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetsyndie-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwhite-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwiz-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetyellow-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetNT-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetUSA-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblack-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetblue-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetbrown-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcaptain-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetce-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcentcom-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcmo-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetcosmos-inhand-right", - "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 - ] - ] - }, - { - "name": "sheetcult-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetgreen-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetgrey-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethop-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheethos-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetian-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmedical-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetmime-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetorange-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetpurple-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetqm-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrainbow-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetrd-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetred-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetsyndie-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwhite-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetwiz-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "sheetyellow-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "bling-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "redtie-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "stethoscope-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "stripedbluescarf-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "stripedredscarf-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "stripedgreenscarf-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "zebrascarf-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "dettie-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "headphones_on-equipped-NECK", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "headphones_off-equipped-NECK", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "headphones_on-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "headphones_on-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "bling", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "stripedgreenscarf", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "stripedbluescarf", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "stripedredscarf", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "zebrascarf", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "stethoscope", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "dettie", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "redtie", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "headphones_off", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "headphones_on", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Buildings/light_small.rsi/broken.png b/Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/broken.png rename to Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png diff --git a/Resources/Textures/Buildings/light_small.rsi/burned.png b/Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/burned.png rename to Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png diff --git a/Resources/Textures/Buildings/light_small.rsi/empty.png b/Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/empty.png rename to Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png diff --git a/Resources/Textures/Buildings/light_small.rsi/meta.json b/Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/meta.json rename to Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json diff --git a/Resources/Textures/Buildings/light_small.rsi/off.png b/Resources/Textures/Constructible/Lighting/light_small.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/off.png rename to Resources/Textures/Constructible/Lighting/light_small.rsi/off.png diff --git a/Resources/Textures/Buildings/light_small.rsi/on.png b/Resources/Textures/Constructible/Lighting/light_small.rsi/on.png similarity index 100% rename from Resources/Textures/Buildings/light_small.rsi/on.png rename to Resources/Textures/Constructible/Lighting/light_small.rsi/on.png diff --git a/Resources/Textures/Buildings/light_tube.rsi/broken.png b/Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/broken.png rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png diff --git a/Resources/Textures/Buildings/light_tube.rsi/burned.png b/Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/burned.png rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png diff --git a/Resources/Textures/Buildings/light_tube.rsi/empty.png b/Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/empty.png rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png diff --git a/Resources/Textures/Buildings/light_tube.rsi/meta.json b/Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/meta.json rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json diff --git a/Resources/Textures/Buildings/light_tube.rsi/off.png b/Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/off.png rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png diff --git a/Resources/Textures/Buildings/light_tube.rsi/on.png b/Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png similarity index 100% rename from Resources/Textures/Buildings/light_tube.rsi/on.png rename to Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png diff --git a/Resources/Textures/Objects/Lighting/lighting.rsi/construct.png b/Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png similarity index 100% rename from Resources/Textures/Objects/Lighting/lighting.rsi/construct.png rename to Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png diff --git a/Resources/Textures/Objects/Lighting/lighting.rsi/empty.png b/Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png similarity index 100% rename from Resources/Textures/Objects/Lighting/lighting.rsi/empty.png rename to Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png diff --git a/Resources/Textures/Objects/Lighting/lighting.rsi/meta.json b/Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Lighting/lighting.rsi/meta.json rename to Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json diff --git a/Resources/Textures/Objects/Lighting/lighting.rsi/off.png b/Resources/Textures/Constructible/Lighting/lighting.rsi/off.png similarity index 100% rename from Resources/Textures/Objects/Lighting/lighting.rsi/off.png rename to Resources/Textures/Constructible/Lighting/lighting.rsi/off.png diff --git a/Resources/Textures/Objects/Lighting/lighting.rsi/on.png b/Resources/Textures/Constructible/Lighting/lighting.rsi/on.png similarity index 100% rename from Resources/Textures/Objects/Lighting/lighting.rsi/on.png rename to Resources/Textures/Constructible/Lighting/lighting.rsi/on.png diff --git a/Resources/Textures/Buildings/TurrBase.png b/Resources/Textures/Constructible/Misc/TurrBase.png similarity index 100% rename from Resources/Textures/Buildings/TurrBase.png rename to Resources/Textures/Constructible/Misc/TurrBase.png diff --git a/Resources/Textures/Buildings/TurrLamp.png b/Resources/Textures/Constructible/Misc/TurrLamp.png similarity index 100% rename from Resources/Textures/Buildings/TurrLamp.png rename to Resources/Textures/Constructible/Misc/TurrLamp.png diff --git a/Resources/Textures/Buildings/TurrTop.png b/Resources/Textures/Constructible/Misc/TurrTop.png similarity index 100% rename from Resources/Textures/Buildings/TurrTop.png rename to Resources/Textures/Constructible/Misc/TurrTop.png diff --git a/Resources/Textures/Buildings/barsign.rsi/alohasnackbar.png b/Resources/Textures/Constructible/Misc/barsign.rsi/alohasnackbar.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/alohasnackbar.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/alohasnackbar.png diff --git a/Resources/Textures/Buildings/barsign.rsi/combocafe.png b/Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/combocafe.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png diff --git a/Resources/Textures/Buildings/barsign.rsi/emergencyrumparty.png b/Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/emergencyrumparty.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png diff --git a/Resources/Textures/Buildings/barsign.rsi/empbarsign.png b/Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/empbarsign.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png diff --git a/Resources/Textures/Buildings/barsign.rsi/empty.png b/Resources/Textures/Constructible/Misc/barsign.rsi/empty.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/empty.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/empty.png diff --git a/Resources/Textures/Buildings/barsign.rsi/enginechange.png b/Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/enginechange.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png diff --git a/Resources/Textures/Buildings/barsign.rsi/goose.png b/Resources/Textures/Constructible/Misc/barsign.rsi/goose.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/goose.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/goose.png diff --git a/Resources/Textures/Buildings/barsign.rsi/honkednloaded.png b/Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/honkednloaded.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png diff --git a/Resources/Textures/Buildings/barsign.rsi/maidcafe.png b/Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/maidcafe.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png diff --git a/Resources/Textures/Buildings/barsign.rsi/maltesefalcon.png b/Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/maltesefalcon.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png diff --git a/Resources/Textures/Buildings/barsign.rsi/meta.json b/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/meta.json rename to Resources/Textures/Constructible/Misc/barsign.rsi/meta.json diff --git a/Resources/Textures/Buildings/barsign.rsi/officerbeersky.png b/Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/officerbeersky.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png diff --git a/Resources/Textures/Buildings/barsign.rsi/oldcockinn.png b/Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/oldcockinn.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png diff --git a/Resources/Textures/Buildings/barsign.rsi/robustacafe.png b/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/robustacafe.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png diff --git a/Resources/Textures/Buildings/barsign.rsi/scotchservinwill.png b/Resources/Textures/Constructible/Misc/barsign.rsi/scotchservinwill.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/scotchservinwill.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/scotchservinwill.png diff --git a/Resources/Textures/Buildings/barsign.rsi/slipperyshots.png b/Resources/Textures/Constructible/Misc/barsign.rsi/slipperyshots.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/slipperyshots.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/slipperyshots.png diff --git a/Resources/Textures/Buildings/barsign.rsi/syndibarsign.png b/Resources/Textures/Constructible/Misc/barsign.rsi/syndibarsign.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/syndibarsign.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/syndibarsign.png diff --git a/Resources/Textures/Buildings/barsign.rsi/the_lightbulb.png b/Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/the_lightbulb.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png diff --git a/Resources/Textures/Buildings/barsign.rsi/theadminbus.png b/Resources/Textures/Constructible/Misc/barsign.rsi/theadminbus.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/theadminbus.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/theadminbus.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thealenath.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thealenath.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thebark.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thebark.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thebark.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thebark.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thecavern.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thecavern.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thecavern.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thecavern.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thecoderbus.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thecoderbus.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thedrunkcarp.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thedrunkcarp.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thegreytide.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thegreytide.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png diff --git a/Resources/Textures/Buildings/barsign.rsi/theharmbaton.png b/Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/theharmbaton.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thenest.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thenest.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thenest.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thenest.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thenet.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thenet.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png diff --git a/Resources/Textures/Buildings/barsign.rsi/theouterspess.png b/Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/theouterspess.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png diff --git a/Resources/Textures/Buildings/barsign.rsi/theshaken.png b/Resources/Textures/Constructible/Misc/barsign.rsi/theshaken.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/theshaken.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/theshaken.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thesingulo.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thesingulo.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png diff --git a/Resources/Textures/Buildings/barsign.rsi/thewretchedhive.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/thewretchedhive.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png diff --git a/Resources/Textures/Buildings/barsign.rsi/vladssaladbar.png b/Resources/Textures/Constructible/Misc/barsign.rsi/vladssaladbar.png similarity index 100% rename from Resources/Textures/Buildings/barsign.rsi/vladssaladbar.png rename to Resources/Textures/Constructible/Misc/barsign.rsi/vladssaladbar.png diff --git a/Resources/Textures/Buildings/furniture.rsi/armchair_preview.png b/Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/armchair_preview.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png diff --git a/Resources/Textures/Buildings/furniture.rsi/bar_chair.png b/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/bar_chair.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png diff --git a/Resources/Textures/Buildings/furniture.rsi/bar_chair_over.png b/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/bar_chair_over.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png diff --git a/Resources/Textures/Buildings/furniture.rsi/bar_stool.png b/Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/bar_stool.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png diff --git a/Resources/Textures/Buildings/furniture.rsi/bed.png b/Resources/Textures/Constructible/Misc/furniture.rsi/bed.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/bed.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/bed.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png b/Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png new file mode 100644 index 0000000000..8eea972fc9 Binary files /dev/null and b/Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png differ diff --git a/Resources/Textures/Buildings/furniture.rsi/blank.png b/Resources/Textures/Constructible/Misc/furniture.rsi/blank.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/blank.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/blank.png diff --git a/Resources/Textures/Buildings/furniture.rsi/chair.png b/Resources/Textures/Constructible/Misc/furniture.rsi/chair.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/chair.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/chair.png diff --git a/Resources/Textures/Buildings/furniture.rsi/chair_armrest.png b/Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/chair_armrest.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png diff --git a/Resources/Textures/Buildings/furniture.rsi/chair_padding.png b/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/chair_padding.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png diff --git a/Resources/Textures/Buildings/furniture.rsi/chair_padding_over.png b/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/chair_padding_over.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png diff --git a/Resources/Textures/Buildings/furniture.rsi/chair_preview.png b/Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/chair_preview.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png diff --git a/Resources/Textures/Buildings/furniture.rsi/comfychair_preview.png b/Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/comfychair_preview.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png diff --git a/Resources/Textures/Buildings/furniture.rsi/meta.json b/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/meta.json rename to Resources/Textures/Constructible/Misc/furniture.rsi/meta.json diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png b/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/officechair_dark.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_white.png b/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/officechair_white.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png diff --git a/Resources/Textures/Buildings/furniture.rsi/onestar_chair_grey.png b/Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_grey.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/onestar_chair_grey.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_grey.png diff --git a/Resources/Textures/Buildings/furniture.rsi/onestar_chair_red.png b/Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_red.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/onestar_chair_red.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_red.png diff --git a/Resources/Textures/Buildings/furniture.rsi/psychbed.png b/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/psychbed.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png diff --git a/Resources/Textures/Buildings/furniture.rsi/psychbed_padding.png b/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/psychbed_padding.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png diff --git a/Resources/Textures/Buildings/furniture.rsi/shuttle_chair.png b/Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/shuttle_chair.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png diff --git a/Resources/Textures/Buildings/furniture.rsi/stool_base.png b/Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/stool_base.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png diff --git a/Resources/Textures/Buildings/furniture.rsi/stool_padded_preview.png b/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/stool_padded_preview.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png diff --git a/Resources/Textures/Buildings/furniture.rsi/stool_padding.png b/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/stool_padding.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png diff --git a/Resources/Textures/Buildings/furniture.rsi/stool_preview.png b/Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/stool_preview.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png diff --git a/Resources/Textures/Buildings/furniture.rsi/w_overlay.png b/Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/w_overlay.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png diff --git a/Resources/Textures/Buildings/furniture.rsi/wheelchair.png b/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/wheelchair.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png diff --git a/Resources/Textures/Buildings/furniture.rsi/wheelchair_folded.png b/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/wheelchair_folded.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png diff --git a/Resources/Textures/Buildings/furniture.rsi/wooden_chair.png b/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/wooden_chair.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png diff --git a/Resources/Textures/Buildings/furniture.rsi/wooden_chair_wings.png b/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png similarity index 100% rename from Resources/Textures/Buildings/furniture.rsi/wooden_chair_wings.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png diff --git a/Resources/Textures/Buildings/mirror.rsi/meta.json b/Resources/Textures/Constructible/Misc/mirror.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/mirror.rsi/meta.json rename to Resources/Textures/Constructible/Misc/mirror.rsi/meta.json diff --git a/Resources/Textures/Buildings/mirror.rsi/mirror.png b/Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png similarity index 100% rename from Resources/Textures/Buildings/mirror.rsi/mirror.png rename to Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png diff --git a/Resources/Textures/Buildings/mirror.rsi/mirror_broke.png b/Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png similarity index 100% rename from Resources/Textures/Buildings/mirror.rsi/mirror_broke.png rename to Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/applebush.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/applebush.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/meta.json b/Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/meta.json rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-01.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-01.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-02.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-02.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-03.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-03.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-04.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-04.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-05.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-05.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-06.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-06.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-07.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-07.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-08.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-08.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-09.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-09.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-10.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-10.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-11.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-11.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-12.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-12.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-13.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-13.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-14.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-14.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-15.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-15.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-16.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-16.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-17.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-17.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-18.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-18.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-19.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-19.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-20.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-20.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-21.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-21.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-22.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-22.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-23.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-23.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-24.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-24.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-25.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-25.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-26.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-26.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-27.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-27.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-28.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-28.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/plant-29.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/plant-29.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png diff --git a/Resources/Textures/Objects/potted_plants.rsi/random.png b/Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png similarity index 100% rename from Resources/Textures/Objects/potted_plants.rsi/random.png rename to Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png diff --git a/Resources/Textures/Buildings/watertank.png b/Resources/Textures/Constructible/Misc/watertank.png similarity index 100% rename from Resources/Textures/Buildings/watertank.png rename to Resources/Textures/Constructible/Misc/watertank.png diff --git a/Resources/Textures/Buildings/weldtank.png b/Resources/Textures/Constructible/Misc/weldtank.png similarity index 100% rename from Resources/Textures/Buildings/weldtank.png rename to Resources/Textures/Constructible/Misc/weldtank.png diff --git a/Resources/Textures/Buildings/VendingMachines/ammo.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/ammo.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/ammo.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/ammo.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/ammo.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/ammo.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/ammo.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/ammo.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/boozeomat.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cart.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/chapel.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/chapel.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/chapel.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/chapel.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/chapel.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/chapel.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/chapel.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/chapel.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/chapel.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/chapel.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cigs.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/hellfire.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/hellfire.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/coffee.rsi/screen.png rename to Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/cola.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/dinnerware.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/discount.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/discount.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/discount.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/discount.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/discount.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/discount.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/discount.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/empty.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/empty.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/empty.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/empty.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/empty.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/empty.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/empty.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/empty.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/hats.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/hats.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/hats.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/hats.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/hats.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/hats.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/hats.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/hats.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/magivend.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/magivend.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/magivend.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/magivend.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/magivend.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/magivend.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/magivend.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png diff --git a/Resources/Textures/Buildings/maintenance_panel.png b/Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png similarity index 100% rename from Resources/Textures/Buildings/maintenance_panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/medical.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/mining.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/mining.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/mining.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/mining.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/mining.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/mining.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/mining.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/mining.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/mining.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/nutri.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/robotics.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/robotics.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/robotics.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/robotics.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/robotics.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/robotics.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/robotics.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/robotics.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/robotics.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/robotics.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/sale.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sale.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/sale.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sale.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/sale.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sale.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/sale.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sale.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sec.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/seeds.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/seeds.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/seeds.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/seeds.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/seeds.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/seeds.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/seeds.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/shoes.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/shoes.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/shoes.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/shoes.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/shoes.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/shoes.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/shoes.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/shoes.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/smartfridge.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/snack.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/soviet.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/soviet.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/soviet.rsi/dangermode.png b/Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/dangermode.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/soviet.rsi/dangermode.png rename to Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/dangermode.png diff --git a/Resources/Textures/Buildings/VendingMachines/soviet.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/soviet.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/soviet.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/soviet.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/soviet.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/soviet.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/soviet.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/suits.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/suits.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/suits.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/suits.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/suits.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/suits.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/suits.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/suits.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/overlay.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/overlay.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/overlay.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/overlay.png diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/theater.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vendomat.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png diff --git a/Resources/Textures/Buildings/VendingMachines/vox.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vox.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/vox.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vox.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/vox.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vox.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/vox.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/vox.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/wallmed.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/wallmed.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/wallmed.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/wallmed.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/wallmed.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/wallmed.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/wallmed.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png similarity index 100% rename from Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png rename to Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc-b.png b/Resources/Textures/Constructible/Power/apc.rsi/apc-b.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc-b.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc-b.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc-spark.png b/Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc-spark.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc0.png b/Resources/Textures/Constructible/Power/apc.rsi/apc0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc1-b-nocover.png b/Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc1-b-nocover.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc1-nocover.png b/Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc1-nocover.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc1.png b/Resources/Textures/Constructible/Power/apc.rsi/apc1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc1.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc2-b-nocover.png b/Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc2-b-nocover.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc2-nocover.png b/Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc2-nocover.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png diff --git a/Resources/Textures/Buildings/apc.rsi/apc2.png b/Resources/Textures/Constructible/Power/apc.rsi/apc2.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apc2.png rename to Resources/Textures/Constructible/Power/apc.rsi/apc2.png diff --git a/Resources/Textures/Buildings/apc.rsi/apcemag.png b/Resources/Textures/Constructible/Power/apc.rsi/apcemag.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apcemag.png rename to Resources/Textures/Constructible/Power/apc.rsi/apcemag.png diff --git a/Resources/Textures/Buildings/apc.rsi/apcewires.png b/Resources/Textures/Constructible/Power/apc.rsi/apcewires.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apcewires.png rename to Resources/Textures/Constructible/Power/apc.rsi/apcewires.png diff --git a/Resources/Textures/Buildings/apc.rsi/apcmaint.png b/Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apcmaint.png rename to Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco0-0.png b/Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco0-0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco0-1.png b/Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco0-1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco0-2.png b/Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco0-2.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco0-3.png b/Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco0-3.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco1-0.png b/Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco1-0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco1-1.png b/Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco1-1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco1-2.png b/Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco1-2.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco1-3.png b/Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco1-3.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco2-0.png b/Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco2-0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco2-1.png b/Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco2-1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco2-2.png b/Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco2-2.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco2-3.png b/Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco2-3.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco3-0.png b/Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco3-0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco3-1.png b/Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco3-1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png diff --git a/Resources/Textures/Buildings/apc.rsi/apco3-2.png b/Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apco3-2.png rename to Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png diff --git a/Resources/Textures/Buildings/apc.rsi/apcox-0.png b/Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apcox-0.png rename to Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png diff --git a/Resources/Textures/Buildings/apc.rsi/apcox-1.png b/Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/apcox-1.png rename to Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png diff --git a/Resources/Textures/Buildings/apc.rsi/meta.json b/Resources/Textures/Constructible/Power/apc.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/apc.rsi/meta.json rename to Resources/Textures/Constructible/Power/apc.rsi/meta.json diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_building.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_building.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_building_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building_unlit.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_building_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building_unlit.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_glass_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_glass_plate.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_glass_plate.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_glass_plate.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_gold_plate.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_gold_plate.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_metal_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_metal_plate.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_metal_plate.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_metal_plate.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_phoron_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_phoron_sheet.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_phoron_sheet.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_phoron_sheet.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_unlit.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_unlit.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_panel.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_panel.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_panel.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_panel.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_unlit.png similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_unlit.png diff --git a/Resources/Textures/Buildings/autolathe.rsi/meta.json b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/autolathe.rsi/meta.json rename to Resources/Textures/Constructible/Power/autolathe.rsi/meta.json diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/empty.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/empty.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/full.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/full.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-charged.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-charged.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-charging.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-charging.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-empty.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-empty.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-off.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/light-off.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/meta.json b/Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/meta.json rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json diff --git a/Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/open.png b/Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/cell_recharger.rsi/open.png rename to Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png diff --git a/Resources/Textures/Buildings/research.rsi/circuit_imprinter.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/circuit_imprinter.png rename to Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png diff --git a/Resources/Textures/Buildings/research.rsi/circuit_imprinter_ani.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/circuit_imprinter_ani.png rename to Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png diff --git a/Resources/Textures/Buildings/research.rsi/circuit_imprinter_t.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/circuit_imprinter_t.png rename to Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json b/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json new file mode 100644 index 0000000000..5398c75b53 --- /dev/null +++ b/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", + "states": [ + { + "name": "circuit_imprinter", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "circuit_imprinter_ani", + "directions": 1, + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "circuit_imprinter_t", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/computer.rsi/ai-fixer-404.png b/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/ai-fixer-404.png rename to Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png diff --git a/Resources/Textures/Buildings/computer.rsi/ai-fixer-empty.png b/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/ai-fixer-empty.png rename to Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png diff --git a/Resources/Textures/Buildings/computer.rsi/ai-fixer-full.png b/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/ai-fixer-full.png rename to Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png diff --git a/Resources/Textures/Buildings/computer.rsi/ai-fixer-on.png b/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/ai-fixer-on.png rename to Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png diff --git a/Resources/Textures/Buildings/computer.rsi/ai-fixer.png b/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/ai-fixer.png rename to Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png diff --git a/Resources/Textures/Buildings/computer.rsi/aiupload.png b/Resources/Textures/Constructible/Power/computers.rsi/aiupload.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/aiupload.png rename to Resources/Textures/Constructible/Power/computers.rsi/aiupload.png diff --git a/Resources/Textures/Buildings/computer.rsi/aiupload_key.png b/Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/aiupload_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/alert-0.png b/Resources/Textures/Constructible/Power/computers.rsi/alert-0.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/alert-0.png rename to Resources/Textures/Constructible/Power/computers.rsi/alert-0.png diff --git a/Resources/Textures/Buildings/computer.rsi/alert-1.png b/Resources/Textures/Constructible/Power/computers.rsi/alert-1.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/alert-1.png rename to Resources/Textures/Constructible/Power/computers.rsi/alert-1.png diff --git a/Resources/Textures/Buildings/computer.rsi/alert-2.png b/Resources/Textures/Constructible/Power/computers.rsi/alert-2.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/alert-2.png rename to Resources/Textures/Constructible/Power/computers.rsi/alert-2.png diff --git a/Resources/Textures/Buildings/computer.rsi/arcade.png b/Resources/Textures/Constructible/Power/computers.rsi/arcade.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/arcade.png rename to Resources/Textures/Constructible/Power/computers.rsi/arcade.png diff --git a/Resources/Textures/Buildings/computer.rsi/arcade_broken.png b/Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/arcade_broken.png rename to Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png diff --git a/Resources/Textures/Buildings/computer.rsi/area_atmos.png b/Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/area_atmos.png rename to Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png diff --git a/Resources/Textures/Buildings/computer.rsi/atmos_key.png b/Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/atmos_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/atmos_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/atmos_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/broken.png b/Resources/Textures/Constructible/Power/computers.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/broken.png rename to Resources/Textures/Constructible/Power/computers.rsi/broken.png diff --git a/Resources/Textures/Buildings/computer.rsi/cameras.png b/Resources/Textures/Constructible/Power/computers.rsi/cameras.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/cameras.png rename to Resources/Textures/Constructible/Power/computers.rsi/cameras.png diff --git a/Resources/Textures/Buildings/computer.rsi/comm.png b/Resources/Textures/Constructible/Power/computers.rsi/comm.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/comm.png rename to Resources/Textures/Constructible/Power/computers.rsi/comm.png diff --git a/Resources/Textures/Buildings/computer.rsi/comm_logs.png b/Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/comm_logs.png rename to Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png diff --git a/Resources/Textures/Buildings/computer.rsi/comm_monitor.png b/Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/comm_monitor.png rename to Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png diff --git a/Resources/Textures/Buildings/computer.rsi/command.png b/Resources/Textures/Constructible/Power/computers.rsi/command.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/command.png rename to Resources/Textures/Constructible/Power/computers.rsi/command.png diff --git a/Resources/Textures/Buildings/computer.rsi/computer-datatheory.png b/Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/computer-datatheory.png rename to Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png diff --git a/Resources/Textures/Buildings/computer.rsi/computer.png b/Resources/Textures/Constructible/Power/computers.rsi/computer.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/computer.png rename to Resources/Textures/Constructible/Power/computers.rsi/computer.png diff --git a/Resources/Textures/Buildings/computer.rsi/computer_broken.png b/Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/computer_broken.png rename to Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png diff --git a/Resources/Textures/Buildings/computer.rsi/crew.png b/Resources/Textures/Constructible/Power/computers.rsi/crew.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/crew.png rename to Resources/Textures/Constructible/Power/computers.rsi/crew.png diff --git a/Resources/Textures/Buildings/computer.rsi/dna.png b/Resources/Textures/Constructible/Power/computers.rsi/dna.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/dna.png rename to Resources/Textures/Constructible/Power/computers.rsi/dna.png diff --git a/Resources/Textures/Buildings/computer.rsi/dron_control_monitor.png b/Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/dron_control_monitor.png rename to Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png diff --git a/Resources/Textures/Buildings/computer.rsi/engie_cams.png b/Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/engie_cams.png rename to Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png diff --git a/Resources/Textures/Buildings/computer.rsi/engine.png b/Resources/Textures/Constructible/Power/computers.rsi/engine.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/engine.png rename to Resources/Textures/Constructible/Power/computers.rsi/engine.png diff --git a/Resources/Textures/Buildings/computer.rsi/entertainment.png b/Resources/Textures/Constructible/Power/computers.rsi/entertainment.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/entertainment.png rename to Resources/Textures/Constructible/Power/computers.rsi/entertainment.png diff --git a/Resources/Textures/Buildings/computer.rsi/eris_control.png b/Resources/Textures/Constructible/Power/computers.rsi/eris_control.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/eris_control.png rename to Resources/Textures/Constructible/Power/computers.rsi/eris_control.png diff --git a/Resources/Textures/Buildings/computer.rsi/error.png b/Resources/Textures/Constructible/Power/computers.rsi/error.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/error.png rename to Resources/Textures/Constructible/Power/computers.rsi/error.png diff --git a/Resources/Textures/Buildings/computer.rsi/explosive.png b/Resources/Textures/Constructible/Power/computers.rsi/explosive.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/explosive.png rename to Resources/Textures/Constructible/Power/computers.rsi/explosive.png diff --git a/Resources/Textures/Buildings/computer.rsi/forensic.png b/Resources/Textures/Constructible/Power/computers.rsi/forensic.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/forensic.png rename to Resources/Textures/Constructible/Power/computers.rsi/forensic.png diff --git a/Resources/Textures/Buildings/computer.rsi/generic.png b/Resources/Textures/Constructible/Power/computers.rsi/generic.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/generic.png rename to Resources/Textures/Constructible/Power/computers.rsi/generic.png diff --git a/Resources/Textures/Buildings/computer.rsi/generic_key.png b/Resources/Textures/Constructible/Power/computers.rsi/generic_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/generic_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/generic_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/generic_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/generic_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/holocontrol.png b/Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/holocontrol.png rename to Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png diff --git a/Resources/Textures/Buildings/computer.rsi/id.png b/Resources/Textures/Constructible/Power/computers.rsi/id.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/id.png rename to Resources/Textures/Constructible/Power/computers.rsi/id.png diff --git a/Resources/Textures/Buildings/computer.rsi/id_key.png b/Resources/Textures/Constructible/Power/computers.rsi/id_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/id_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/id_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/id_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/id_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/invaders.png b/Resources/Textures/Constructible/Power/computers.rsi/invaders.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/invaders.png rename to Resources/Textures/Constructible/Power/computers.rsi/invaders.png diff --git a/Resources/Textures/Buildings/computer.rsi/mass_driver.png b/Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/mass_driver.png rename to Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png diff --git a/Resources/Textures/Buildings/computer.rsi/mecha.png b/Resources/Textures/Constructible/Power/computers.rsi/mecha.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/mecha.png rename to Resources/Textures/Constructible/Power/computers.rsi/mecha.png diff --git a/Resources/Textures/Buildings/computer.rsi/med_key.png b/Resources/Textures/Constructible/Power/computers.rsi/med_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/med_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/med_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/med_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/med_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/medcomp.png b/Resources/Textures/Constructible/Power/computers.rsi/medcomp.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/medcomp.png rename to Resources/Textures/Constructible/Power/computers.rsi/medcomp.png diff --git a/Resources/Textures/Buildings/computer.rsi/meta.json b/Resources/Textures/Constructible/Power/computers.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/meta.json rename to Resources/Textures/Constructible/Power/computers.rsi/meta.json diff --git a/Resources/Textures/Buildings/computer.rsi/mining.png b/Resources/Textures/Constructible/Power/computers.rsi/mining.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/mining.png rename to Resources/Textures/Constructible/Power/computers.rsi/mining.png diff --git a/Resources/Textures/Buildings/computer.rsi/mining_key.png b/Resources/Textures/Constructible/Power/computers.rsi/mining_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/mining_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/mining_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/mining_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/mining_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/power_key.png b/Resources/Textures/Constructible/Power/computers.rsi/power_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/power_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/power_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/power_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/power_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/power_monitor.png b/Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/power_monitor.png rename to Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png diff --git a/Resources/Textures/Buildings/computer.rsi/power_monitor_warn.png b/Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/power_monitor_warn.png rename to Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png diff --git a/Resources/Textures/Buildings/computer.rsi/rd_key.png b/Resources/Textures/Constructible/Power/computers.rsi/rd_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/rd_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/rd_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/rd_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/rd_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/rdcomp.png b/Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/rdcomp.png rename to Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png diff --git a/Resources/Textures/Buildings/computer.rsi/recharge_comp.png b/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/recharge_comp.png rename to Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png diff --git a/Resources/Textures/Buildings/computer.rsi/recharge_comp_on.png b/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/recharge_comp_on.png rename to Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png diff --git a/Resources/Textures/Buildings/computer.rsi/request.png b/Resources/Textures/Constructible/Power/computers.rsi/request.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/request.png rename to Resources/Textures/Constructible/Power/computers.rsi/request.png diff --git a/Resources/Textures/Buildings/computer.rsi/robot.png b/Resources/Textures/Constructible/Power/computers.rsi/robot.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/robot.png rename to Resources/Textures/Constructible/Power/computers.rsi/robot.png diff --git a/Resources/Textures/Buildings/computer.rsi/security.png b/Resources/Textures/Constructible/Power/computers.rsi/security.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/security.png rename to Resources/Textures/Constructible/Power/computers.rsi/security.png diff --git a/Resources/Textures/Buildings/computer.rsi/security_key.png b/Resources/Textures/Constructible/Power/computers.rsi/security_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/security_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/security_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/security_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/security_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/shuttle.png b/Resources/Textures/Constructible/Power/computers.rsi/shuttle.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/shuttle.png rename to Resources/Textures/Constructible/Power/computers.rsi/shuttle.png diff --git a/Resources/Textures/Buildings/computer.rsi/solar_screen.png b/Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/solar_screen.png rename to Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png diff --git a/Resources/Textures/Buildings/computer.rsi/supply.png b/Resources/Textures/Constructible/Power/computers.rsi/supply.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/supply.png rename to Resources/Textures/Constructible/Power/computers.rsi/supply.png diff --git a/Resources/Textures/Buildings/computer.rsi/syndie_key.png b/Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/syndie_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/syndie_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/syndie_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/syndishuttle.png b/Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/syndishuttle.png rename to Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png diff --git a/Resources/Textures/Buildings/computer.rsi/tank.png b/Resources/Textures/Constructible/Power/computers.rsi/tank.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/tank.png rename to Resources/Textures/Constructible/Power/computers.rsi/tank.png diff --git a/Resources/Textures/Buildings/computer.rsi/tcboss.png b/Resources/Textures/Constructible/Power/computers.rsi/tcboss.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/tcboss.png rename to Resources/Textures/Constructible/Power/computers.rsi/tcboss.png diff --git a/Resources/Textures/Buildings/computer.rsi/tech_key.png b/Resources/Textures/Constructible/Power/computers.rsi/tech_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/tech_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/tech_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/tech_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/tech_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/teleport.png b/Resources/Textures/Constructible/Power/computers.rsi/teleport.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/teleport.png rename to Resources/Textures/Constructible/Power/computers.rsi/teleport.png diff --git a/Resources/Textures/Buildings/computer.rsi/teleport_key.png b/Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/teleport_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/teleport_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/teleport_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/telesci.png b/Resources/Textures/Constructible/Power/computers.rsi/telesci.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/telesci.png rename to Resources/Textures/Constructible/Power/computers.rsi/telesci.png diff --git a/Resources/Textures/Buildings/computer.rsi/telesci_key.png b/Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/telesci_key.png rename to Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png diff --git a/Resources/Textures/Buildings/computer.rsi/telesci_key_off.png b/Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/telesci_key_off.png rename to Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png diff --git a/Resources/Textures/Buildings/computer.rsi/turbinecomp.png b/Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png similarity index 100% rename from Resources/Textures/Buildings/computer.rsi/turbinecomp.png rename to Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png diff --git a/Resources/Textures/Buildings/research.rsi/d_analyzer.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/d_analyzer.png rename to Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png diff --git a/Resources/Textures/Buildings/research.rsi/d_analyzer_l.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/d_analyzer_l.png rename to Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png diff --git a/Resources/Textures/Buildings/research.rsi/d_analyzer_la.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/d_analyzer_la.png rename to Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png diff --git a/Resources/Textures/Buildings/research.rsi/d_analyzer_process.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/d_analyzer_process.png rename to Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png diff --git a/Resources/Textures/Buildings/research.rsi/d_analyzer_t.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/d_analyzer_t.png rename to Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json b/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json new file mode 100644 index 0000000000..9b87075df2 --- /dev/null +++ b/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", + "states": [ + { + "name": "d_analyzer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "d_analyzer_l", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "d_analyzer_la", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "d_analyzer_process", + "directions": 1, + "delays": [ + [ + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09 + ] + ] + }, + { + "name": "d_analyzer_t", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/chemicals.rsi/booze_dispenser.png b/Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/booze_dispenser.png rename to Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/dispenser.png b/Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/dispenser.png rename to Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json b/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json new file mode 100644 index 0000000000..bfa10c575d --- /dev/null +++ b/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json @@ -0,0 +1 @@ +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"booze_dispenser","directions":1,"delays":[[1.0]]},{"name":"dispenser","directions":1,"delays":[[1.0]]}]} diff --git a/Resources/Textures/Buildings/chemicals.rsi/soda_dispenser.png b/Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/soda_dispenser.png rename to Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png diff --git a/Resources/Textures/Objects/Power/eightdirwire.png b/Resources/Textures/Constructible/Power/eightdirwire.png similarity index 100% rename from Resources/Textures/Objects/Power/eightdirwire.png rename to Resources/Textures/Constructible/Power/eightdirwire.png diff --git a/Resources/Textures/Objects/Power/generator.png b/Resources/Textures/Constructible/Power/generator.png similarity index 100% rename from Resources/Textures/Objects/Power/generator.png rename to Resources/Textures/Constructible/Power/generator.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/genesplicer_empty.png b/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/genesplicer_empty.png rename to Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/genesplicer_loaded.png b/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/genesplicer_loaded.png rename to Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/genesplicer_screens.png b/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/genesplicer_screens.png rename to Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json b/Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json new file mode 100644 index 0000000000..0967d9e684 --- /dev/null +++ b/Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json @@ -0,0 +1 @@ +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"genesplicer_empty","directions":1,"delays":[[1.0]]},{"name":"genesplicer_loaded","directions":1,"delays":[[1.0]]},{"name":"genesplicer_screens","directions":1,"delays":[[0.4,0.4,0.4,0.4]]}]} diff --git a/Resources/Textures/Buildings/gravity_generator.rsi/broken.png b/Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator.rsi/broken.png rename to Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png diff --git a/Resources/Textures/Buildings/gravity_generator.rsi/meta.json b/Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/gravity_generator.rsi/meta.json rename to Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json diff --git a/Resources/Textures/Buildings/gravity_generator.rsi/off.png b/Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator.rsi/off.png rename to Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png diff --git a/Resources/Textures/Buildings/gravity_generator.rsi/on.png b/Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator.rsi/on.png rename to Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png diff --git a/Resources/Textures/Buildings/gravity_generator_core.rsi/activated.png b/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator_core.rsi/activated.png rename to Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png diff --git a/Resources/Textures/Buildings/gravity_generator_core.rsi/activating.png b/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator_core.rsi/activating.png rename to Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png diff --git a/Resources/Textures/Buildings/gravity_generator_core.rsi/idle.png b/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator_core.rsi/idle.png rename to Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png diff --git a/Resources/Textures/Buildings/gravity_generator_core.rsi/meta.json b/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/gravity_generator_core.rsi/meta.json rename to Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json diff --git a/Resources/Textures/Buildings/gravity_generator_core.rsi/startup.png b/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png similarity index 100% rename from Resources/Textures/Buildings/gravity_generator_core.rsi/startup.png rename to Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_0.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_0.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_0.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_0.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_1.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_1.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_1.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_1.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_10.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_10.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_10.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_10.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_11.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_11.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_11.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_11.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_12.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_12.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_12.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_12.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_13.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_13.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_13.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_13.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_14.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_14.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_14.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_14.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_15.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_15.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_15.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_15.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_2.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_2.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_2.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_2.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_3.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_3.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_3.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_3.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_4.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_4.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_4.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_5.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_5.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_5.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_5.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_6.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_6.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_6.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_6.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_7.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_7.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_7.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_7.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_8.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_8.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_8.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_8.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_9.png b/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_9.png similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/hvcable_9.png rename to Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_9.png diff --git a/Resources/Textures/Objects/Power/hv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/hv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/hv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/hv_cable.rsi/meta.json diff --git a/Resources/Textures/Buildings/chemicals.rsi/industrial_dispenser.png b/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/industrial_dispenser.png rename to Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png diff --git a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json b/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json new file mode 100644 index 0000000000..34a7df8d8e --- /dev/null +++ b/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json @@ -0,0 +1 @@ +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"industrial_dispenser","directions":1,"delays":[[1.0]]}]} diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_0.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_0.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_0.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_0.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_1.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_1.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_1.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_1.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_10.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_10.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_10.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_10.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_11.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_11.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_11.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_11.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_12.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_12.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_12.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_12.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_13.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_13.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_13.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_13.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_14.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_14.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_14.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_14.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_15.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_15.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_15.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_15.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_2.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_2.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_2.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_2.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_3.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_3.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_3.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_3.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_4.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_4.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_4.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_4.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_5.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_5.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_5.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_5.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_6.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_6.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_6.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_6.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_7.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_7.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_7.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_7.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_8.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_8.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_8.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_8.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_9.png b/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_9.png similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/lvcable_9.png rename to Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_9.png diff --git a/Resources/Textures/Objects/Power/lv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/lv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/lv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/lv_cable.rsi/meta.json diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/meta.json b/Resources/Textures/Constructible/Power/medical_scanner.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/meta.json rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/meta.json diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_death.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_death.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_death.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_death.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_green.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_green.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_green.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_green.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_off.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_off.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_off.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_off.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_open.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_open.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_open.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_open.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_red.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_red.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_red.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_red.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_blue.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_blue.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_blue.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_blue.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_dead.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_dead.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_dead.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_dead.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_green.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_green.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_green.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_green.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_off.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_off.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_off.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_off.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_red.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_red.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_terminal_red.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_terminal_red.png diff --git a/Resources/Textures/Buildings/medical_scanner.rsi/scanner_yellow.png b/Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_yellow.png similarity index 100% rename from Resources/Textures/Buildings/medical_scanner.rsi/scanner_yellow.png rename to Resources/Textures/Constructible/Power/medical_scanner.rsi/scanner_yellow.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json b/Resources/Textures/Constructible/Power/microwave.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json rename to Resources/Textures/Constructible/Power/microwave.rsi/meta.json diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw.png b/Resources/Textures/Constructible/Power/microwave.rsi/mw.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mw.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mw.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw0.png b/Resources/Textures/Constructible/Power/microwave.rsi/mw0.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mw0.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mw0.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw1.png b/Resources/Textures/Constructible/Power/microwave.rsi/mw1.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mw1.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mw1.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw_running_unlit.png b/Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mw_running_unlit.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw_unlit.png b/Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mw_unlit.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwb.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwb.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwb.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwb.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody0.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody0.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody1.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody1.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloodyo.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloodyo.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwo.png b/Resources/Textures/Constructible/Power/microwave.rsi/mwo.png similarity index 100% rename from Resources/Textures/Objects/Kitchen/microwave.rsi/mwo.png rename to Resources/Textures/Constructible/Power/microwave.rsi/mwo.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/meta.json b/Resources/Textures/Constructible/Power/mixer.rsi/meta.json new file mode 100644 index 0000000000..7ef2fc45bf --- /dev/null +++ b/Resources/Textures/Constructible/Power/mixer.rsi/meta.json @@ -0,0 +1 @@ +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"mixer_empty","directions":1,"delays":[[1.0]]},{"name":"mixer_loaded","directions":1,"delays":[[1.0]]},{"name":"mixer_screens","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]},{"name":"mixer_splicer_screen_broken","directions":1,"delays":[[1.0]]}]} diff --git a/Resources/Textures/Buildings/chemicals.rsi/mixer_empty.png b/Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/mixer_empty.png rename to Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/mixer_loaded.png b/Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/mixer_loaded.png rename to Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/mixer_screens.png b/Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/mixer_screens.png rename to Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png diff --git a/Resources/Textures/Buildings/chemicals.rsi/mixer_splicer_screen_broken.png b/Resources/Textures/Constructible/Power/mixer.rsi/mixer_splicer_screen_broken.png similarity index 100% rename from Resources/Textures/Buildings/chemicals.rsi/mixer_splicer_screen_broken.png rename to Resources/Textures/Constructible/Power/mixer.rsi/mixer_splicer_screen_broken.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/mv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/mv_cable.rsi/meta.json diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_0.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_0.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_0.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_1.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_1.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_1.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_10.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_10.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_10.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_11.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_11.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_11.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_12.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_12.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_12.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_13.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_13.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_13.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_14.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_14.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_14.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_15.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_15.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_15.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_2.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_2.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_2.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_3.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_3.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_3.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_4.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_4.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_4.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_5.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_5.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_5.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_6.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_6.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_6.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_7.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_7.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_7.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_8.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_8.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_8.png diff --git a/Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_9.png similarity index 100% rename from Resources/Textures/Objects/Power/mv_cable.rsi/mvcable_9.png rename to Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_9.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_0.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_0.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_0.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_0.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_1.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_1.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_1.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_1.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_10.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_10.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_10.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_10.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_11.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_11.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_11.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_11.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_12.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_12.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_12.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_12.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_13.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_13.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_13.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_13.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_14.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_14.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_14.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_14.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_15.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_15.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_15.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_15.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_2.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_2.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_2.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_2.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_3.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_3.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_3.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_3.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_4.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_4.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_4.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_4.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_5.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_5.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_5.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_5.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_6.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_6.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_6.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_6.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_7.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_7.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_7.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_7.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_8.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_8.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_8.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_8.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/cable_9.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_9.png similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/cable_9.png rename to Resources/Textures/Constructible/Power/power_cable.rsi/cable_9.png diff --git a/Resources/Textures/Objects/Power/power_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/power_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/power_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/power_cable.rsi/meta.json diff --git a/Resources/Textures/Buildings/research.rsi/meta.json b/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json similarity index 53% rename from Resources/Textures/Buildings/research.rsi/meta.json rename to Resources/Textures/Constructible/Power/protolathe.rsi/meta.json index 37522e74ff..61e2596cd4 100644 --- a/Resources/Textures/Buildings/research.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json @@ -7,137 +7,6 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", "states": [ - { - "name": "circuit_imprinter", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "circuit_imprinter_ani", - "directions": 1, - "delays": [ - [ - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08 - ] - ] - }, - { - "name": "circuit_imprinter_t", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "d_analyzer", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "d_analyzer_l", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "d_analyzer_la", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "d_analyzer_process", - "directions": 1, - "delays": [ - [ - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09 - ] - ] - }, - { - "name": "d_analyzer_t", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, { "name": "protolathe", "directions": 1, @@ -355,93 +224,6 @@ 0.088 ] ] - }, - { - "name": "server", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "server-nopower", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "server-off", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "server-on", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "server_o", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "tdoppler", - "directions": 4, - "delays": [ - [ - 0.8, - 0.2 - ], - [ - 0.8, - 0.2 - ], - [ - 0.8, - 0.2 - ], - [ - 0.8, - 0.2 - ] - ] - }, - { - "name": "tdoppler-broken", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "tdoppler-off", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] } ] } diff --git a/Resources/Textures/Buildings/research.rsi/protolathe.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_adamantine.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_adamantine.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_adamantine.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_adamantine.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_bananium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_bananium.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_bananium.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_bananium.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_building.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_building.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_building.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_building.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_diamond.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_diamond.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_diamond.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_diamond.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_glass.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_glass.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_glass.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_glass.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_gold.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_gold.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_gold.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_gold.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_metal.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_metal.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_metal.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_metal.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_open.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_open.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_open.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_open.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_phoron.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_phoron.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_phoron.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_phoron.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_silver.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_silver.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_silver.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_silver.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_solid plasma.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_solid plasma.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_solid plasma.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_solid plasma.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_unlit.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_unlit.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_unlit.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_unlit.png diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_uranium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_uranium.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/protolathe_uranium.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_uranium.png diff --git a/Resources/Textures/Objects/Power/provider.png b/Resources/Textures/Constructible/Power/provider.png similarity index 100% rename from Resources/Textures/Objects/Power/provider.png rename to Resources/Textures/Constructible/Power/provider.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/empty.png b/Resources/Textures/Constructible/Power/recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/empty.png rename to Resources/Textures/Constructible/Power/recharger.rsi/empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/full.png b/Resources/Textures/Constructible/Power/recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/full.png rename to Resources/Textures/Constructible/Power/recharger.rsi/full.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-charged.png b/Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-charged.png rename to Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-charging.png b/Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-charging.png rename to Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-empty.png b/Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-empty.png rename to Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-off.png b/Resources/Textures/Constructible/Power/recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/light-off.png rename to Resources/Textures/Constructible/Power/recharger.rsi/light-off.png diff --git a/Resources/Textures/Objects/Power/PowerCells/recharger.rsi/meta.json b/Resources/Textures/Constructible/Power/recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/recharger.rsi/meta.json rename to Resources/Textures/Constructible/Power/recharger.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/server.rsi/meta.json b/Resources/Textures/Constructible/Power/server.rsi/meta.json new file mode 100644 index 0000000000..da1f24b184 --- /dev/null +++ b/Resources/Textures/Constructible/Power/server.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", + "states": [ + { + "name": "server", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "server-nopower", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "server-off", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "server-on", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "server_o", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/research.rsi/server-nopower.png b/Resources/Textures/Constructible/Power/server.rsi/server-nopower.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/server-nopower.png rename to Resources/Textures/Constructible/Power/server.rsi/server-nopower.png diff --git a/Resources/Textures/Buildings/research.rsi/server-off.png b/Resources/Textures/Constructible/Power/server.rsi/server-off.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/server-off.png rename to Resources/Textures/Constructible/Power/server.rsi/server-off.png diff --git a/Resources/Textures/Buildings/research.rsi/server-on.png b/Resources/Textures/Constructible/Power/server.rsi/server-on.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/server-on.png rename to Resources/Textures/Constructible/Power/server.rsi/server-on.png diff --git a/Resources/Textures/Buildings/research.rsi/server.png b/Resources/Textures/Constructible/Power/server.rsi/server.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/server.png rename to Resources/Textures/Constructible/Power/server.rsi/server.png diff --git a/Resources/Textures/Buildings/research.rsi/server_o.png b/Resources/Textures/Constructible/Power/server.rsi/server_o.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/server_o.png rename to Resources/Textures/Constructible/Power/server.rsi/server_o.png diff --git a/Resources/Textures/Buildings/smes.rsi/meta.json b/Resources/Textures/Constructible/Power/smes.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/meta.json rename to Resources/Textures/Constructible/Power/smes.rsi/meta.json diff --git a/Resources/Textures/Buildings/smes.rsi/smes-crit.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-crit.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-display.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-display.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-display.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-display.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-oc0.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-oc0.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-oc1.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-oc1.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-oc2.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-oc2.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-og1.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-og1.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-og2.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-og2.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-og3.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-og3.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-og4.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-og4.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-og5.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-og5.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-op0.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-op0.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-op1.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-op1.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes-op2.png b/Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes-op2.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png diff --git a/Resources/Textures/Buildings/smes.rsi/smes.png b/Resources/Textures/Constructible/Power/smes.rsi/smes.png similarity index 100% rename from Resources/Textures/Buildings/smes.rsi/smes.png rename to Resources/Textures/Constructible/Power/smes.rsi/smes.png diff --git a/Resources/Textures/Buildings/solar_panel.rsi/broken.png b/Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png similarity index 100% rename from Resources/Textures/Buildings/solar_panel.rsi/broken.png rename to Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png diff --git a/Resources/Textures/Buildings/solar_panel.rsi/meta.json b/Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/solar_panel.rsi/meta.json rename to Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json diff --git a/Resources/Textures/Buildings/solar_panel.rsi/normal.png b/Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png similarity index 100% rename from Resources/Textures/Buildings/solar_panel.rsi/normal.png rename to Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png diff --git a/Resources/Textures/Objects/Power/storage.png b/Resources/Textures/Constructible/Power/storage.png similarity index 100% rename from Resources/Textures/Objects/Power/storage.png rename to Resources/Textures/Constructible/Power/storage.png diff --git a/Resources/Textures/Constructible/Power/tdopler.rsi/meta.json b/Resources/Textures/Constructible/Power/tdopler.rsi/meta.json new file mode 100644 index 0000000000..7c5d78dcb5 --- /dev/null +++ b/Resources/Textures/Constructible/Power/tdopler.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", + "states": [ + { + "name": "tdoppler", + "directions": 4, + "delays": [ + [ + 0.8, + 0.2 + ], + [ + 0.8, + 0.2 + ], + [ + 0.8, + 0.2 + ], + [ + 0.8, + 0.2 + ] + ] + }, + { + "name": "tdoppler-broken", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "tdoppler-off", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/research.rsi/tdoppler-broken.png b/Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler-broken.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/tdoppler-broken.png rename to Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler-broken.png diff --git a/Resources/Textures/Buildings/research.rsi/tdoppler-off.png b/Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler-off.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/tdoppler-off.png rename to Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler-off.png diff --git a/Resources/Textures/Buildings/research.rsi/tdoppler.png b/Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler.png similarity index 100% rename from Resources/Textures/Buildings/research.rsi/tdoppler.png rename to Resources/Textures/Constructible/Power/tdopler.rsi/tdoppler.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/empty.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/empty.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/full.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/full.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-charged.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-charged.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-charging.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-charging.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-empty.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-empty.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-off.png b/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/light-off.png rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png diff --git a/Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/meta.json b/Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Power/PowerCells/wall_recharger.rsi/meta.json rename to Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json diff --git a/Resources/Textures/Objects/Power/wiredmachine.png b/Resources/Textures/Constructible/Power/wiredmachine.png similarity index 100% rename from Resources/Textures/Objects/Power/wiredmachine.png rename to Resources/Textures/Constructible/Power/wiredmachine.png diff --git a/Resources/Textures/Objects/Furniture/wirelessmachine.png b/Resources/Textures/Constructible/Power/wirelessmachine.png similarity index 100% rename from Resources/Textures/Objects/Furniture/wirelessmachine.png rename to Resources/Textures/Constructible/Power/wirelessmachine.png diff --git a/Resources/Textures/Buildings/crate.rsi/lock_locked.png b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_locked.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/lock_locked.png rename to Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_locked.png diff --git a/Resources/Textures/Buildings/crate.rsi/lock_off.png b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_off.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/lock_off.png rename to Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_off.png diff --git a/Resources/Textures/Buildings/crate.rsi/lock_unlocked.png b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_unlocked.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/lock_unlocked.png rename to Resources/Textures/Constructible/Structures/Crates/effects.rsi/lock_unlocked.png diff --git a/Resources/Textures/Constructible/Structures/Crates/effects.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/meta.json new file mode 100644 index 0000000000..6d6bee1351 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lock_locked", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "lock_off", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "lock_unlocked", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "sparking", + "select": [], + "flags": {}, + "directions": 1, + "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]] + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/sparking.png b/Resources/Textures/Constructible/Structures/Crates/effects.rsi/sparking.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/sparking.png rename to Resources/Textures/Constructible/Structures/Crates/effects.rsi/sparking.png diff --git a/Resources/Textures/Buildings/crate.rsi/freezer.png b/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/freezer.png rename to Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer.png diff --git a/Resources/Textures/Buildings/crate.rsi/freezer_door.png b/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/freezer_door.png rename to Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/freezer_open.png b/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/freezer_open.png rename to Resources/Textures/Constructible/Structures/Crates/freezer.rsi/freezer_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/meta.json new file mode 100644 index 0000000000..37af1684a6 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/freezer.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "freezer", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "freezer_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "freezer_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/crate.png b/Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/crate.png rename to Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate.png diff --git a/Resources/Textures/Buildings/crate.rsi/crate_door.png b/Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/crate_door.png rename to Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/crate_open.png b/Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/crate_open.png rename to Resources/Textures/Constructible/Structures/Crates/generic.rsi/crate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/generic.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/generic.rsi/meta.json new file mode 100644 index 0000000000..d65d10317c --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/generic.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "crate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "crate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "crate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/hydrocrate.png b/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrocrate.png rename to Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/hydrocrate_door.png b/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrocrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/hydrocrate_open.png b/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrocrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/hydro.rsi/hydrocrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/meta.json new file mode 100644 index 0000000000..778f249ffb --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/hydro.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hydrocrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "hydrocrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "hydrocrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/hydrosecurecrate.png b/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrosecurecrate.png rename to Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/hydrosecurecrate_door.png b/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrosecurecrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/hydrosecurecrate_open.png b/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/hydrosecurecrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/hydrosecurecrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/meta.json new file mode 100644 index 0000000000..0f51eca484 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/hydro_secure.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hydrosecurecrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "hydrosecurecrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "hydrosecurecrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/medicalcrate.png b/Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/medicalcrate.png rename to Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/medicalcrate_door.png b/Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/medicalcrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/medicalcrate_open.png b/Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/medicalcrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/medical.rsi/medicalcrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/medical.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/medical.rsi/meta.json new file mode 100644 index 0000000000..1f3e794542 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/medical.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "medicalcrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "medicalcrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "medicalcrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Structures/Crates/o2.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/o2.rsi/meta.json new file mode 100644 index 0000000000..079858f841 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/o2.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "o2crate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "o2crate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "o2crate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/o2crate.png b/Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/o2crate.png rename to Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate.png diff --git a/Resources/Textures/Buildings/crate.rsi/o2crate_door.png b/Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/o2crate_door.png rename to Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/o2crate_open.png b/Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/o2crate_open.png rename to Resources/Textures/Constructible/Structures/Crates/o2.rsi/o2crate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/meta.json new file mode 100644 index 0000000000..bc551ceef4 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plasmacrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "plasmacrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "plasmacrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/plasmacrate.png b/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasmacrate.png rename to Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/plasmacrate_door.png b/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasmacrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/plasmacrate_open.png b/Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasmacrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/plasma.rsi/plasmacrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/meta.json new file mode 100644 index 0000000000..4dd149056b --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plasticcrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "plasticcrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "plasticcrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/plasticcrate.png b/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasticcrate.png rename to Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/plasticcrate_door.png b/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasticcrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/plasticcrate_open.png b/Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/plasticcrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/plastic.rsi/plasticcrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/meta.json new file mode 100644 index 0000000000..03d08f09e2 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "radiationcrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "radiationcrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "radiationcrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/radiationcrate.png b/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/radiationcrate.png rename to Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/radiationcrate_door.png b/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/radiationcrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/radiationcrate_open.png b/Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/radiationcrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/radiation.rsi/radiationcrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/meta.json new file mode 100644 index 0000000000..0b7bd0b3f5 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "secgearcrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "secgearcrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "secgearcrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/secgearcrate.png b/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/secgearcrate.png rename to Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/secgearcrate_door.png b/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/secgearcrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/secgearcrate_open.png b/Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/secgearcrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/sec_gear.rsi/secgearcrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/secure.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/secure.rsi/meta.json new file mode 100644 index 0000000000..230a46f987 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/secure.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "securecrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "securecrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "securecrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/securecrate.png b/Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/securecrate.png rename to Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/securecrate_door.png b/Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/securecrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/securecrate_open.png b/Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/securecrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/secure.rsi/securecrate_open.png diff --git a/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/meta.json b/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/meta.json new file mode 100644 index 0000000000..4652d350bd --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "weaponcrate", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "weaponcrate_door", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "weaponcrate_open", + "select": [], + "flags": {}, + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Buildings/crate.rsi/weaponcrate.png b/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/weaponcrate.png rename to Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate.png diff --git a/Resources/Textures/Buildings/crate.rsi/weaponcrate_door.png b/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate_door.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/weaponcrate_door.png rename to Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate_door.png diff --git a/Resources/Textures/Buildings/crate.rsi/weaponcrate_open.png b/Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate_open.png similarity index 100% rename from Resources/Textures/Buildings/crate.rsi/weaponcrate_open.png rename to Resources/Textures/Constructible/Structures/Crates/weapon.rsi/weaponcrate_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/locked.png new file mode 100644 index 0000000000..fb22d2c3f5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_basic.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_basic.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/locked.png new file mode 100644 index 0000000000..14632928d3 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/locked.png new file mode 100644 index 0000000000..8f44e70188 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_cargo_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/locked.png new file mode 100644 index 0000000000..b41df31aa6 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/locked.png new file mode 100644 index 0000000000..8bf04ab3ec Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_command_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/locked.png new file mode 100644 index 0000000000..1bda1f14c7 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/locked.png new file mode 100644 index 0000000000..1b5b19d26a Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_engineering_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/locked.png new file mode 100644 index 0000000000..4e65d38d3e Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_external.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_external.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/locked.png new file mode 100644 index 0000000000..82e703c1e9 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_freezer.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_freezer.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/locked.png new file mode 100644 index 0000000000..095929aa72 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/locked.png new file mode 100644 index 0000000000..0d8d458cac Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/locked.png new file mode 100644 index 0000000000..d2f326b3d9 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_cargo.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/locked.png new file mode 100644 index 0000000000..4007c1fcb5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_command.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/locked.png new file mode 100644 index 0000000000..9f5ca58e79 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_common.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/locked.png new file mode 100644 index 0000000000..2549c32d68 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_engi.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/locked.png new file mode 100644 index 0000000000..2ffa980742 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_int.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/locked.png new file mode 100644 index 0000000000..8113a1efda Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_med.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/locked.png new file mode 100644 index 0000000000..2d488b7b97 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_rnd.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/locked.png new file mode 100644 index 0000000000..b45cea4073 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_maint_sec.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/locked.png new file mode 100644 index 0000000000..ce9079111d Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/locked.png new file mode 100644 index 0000000000..54597e6a42 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_medical_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/locked.png new file mode 100644 index 0000000000..94372b5a5f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/locked.png new file mode 100644 index 0000000000..8554ceb6ed Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_science_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/locked.png new file mode 100644 index 0000000000..cf6e017161 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security.rsi/welded.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/bolted.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/bolted.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/bolted.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/bolted.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closed.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closed.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closed.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closed_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closed_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closing_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/closing_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/deny.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/deny.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/deny.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/locked.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/locked.png new file mode 100644 index 0000000000..9fdd2c42f0 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/locked.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/meta.json diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/opening_unlit.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/opening_unlit.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_closing.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_closing.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_closing.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_opening.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/panel_opening.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/panel_opening.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/spark.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/spark.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/spark.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_broken.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_broken.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_damaged.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_damaged.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_open.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/sparks_open.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/sparks_open.png diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/welded.png b/Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/welded.png rename to Resources/Textures/Constructible/Structures/Doors/airlock_security_glass.rsi/welded.png diff --git a/Resources/Textures/Buildings/tables.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json similarity index 54% rename from Resources/Textures/Buildings/tables.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json index 6f5451531e..d38885742a 100644 --- a/Resources/Textures/Buildings/tables.rsi/meta.json +++ b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json @@ -159,150 +159,6 @@ 1.0 ] ] - }, - { - "name": "wood_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "wood_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Buildings/tables.rsi/plain_preview.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/plain_preview.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/plain_preview.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/plain_preview.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_0.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_0.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_0.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_0.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_1.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_1.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_1.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_1.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_2.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_2.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_2.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_2.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_3.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_3.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_3.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_3.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_4.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_4.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_4.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_4.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_5.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_5.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_5.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_5.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_6.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_6.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_6.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_6.png diff --git a/Resources/Textures/Buildings/tables.rsi/solid_7.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_7.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/solid_7.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json new file mode 100644 index 0000000000..2502a2b4d4 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json @@ -0,0 +1,155 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "wood_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "wood_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Buildings/tables.rsi/wood_0.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_0.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_0.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_0.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_1.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_1.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_1.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_1.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_2.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_2.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_2.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_2.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_3.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_3.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_3.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_3.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_4.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_4.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_4.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_4.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_5.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_5.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_5.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_5.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_6.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_6.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_6.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_6.png diff --git a/Resources/Textures/Buildings/tables.rsi/wood_7.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_7.png similarity index 100% rename from Resources/Textures/Buildings/tables.rsi/wood_7.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_7.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/0.png b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/0.png rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/1.png b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/1.png rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/2.png b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/2.png rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/3.png b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/3.png rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/4.png b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/4.png rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png diff --git a/Resources/Textures/Buildings/Walls/asteroid_rock.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/asteroid_rock.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick0.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick0.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick1.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick1.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick2.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick2.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick3.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick3.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick4.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick4.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick5.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick5.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick6.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick6.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/brick7.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/brick7.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/brick.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/brick.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock0.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock0.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock1.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock1.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock2.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock2.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock3.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock3.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock4.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock4.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock5.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock5.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock6.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock6.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/clock7.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/clock7.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/clock.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/clock.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown0.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown0.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown1.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown1.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown2.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown2.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown3.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown3.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown4.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown4.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown5.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown5.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown6.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown6.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/clown7.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/clown7.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/clown.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/clown.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult0.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult0.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult1.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult1.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult2.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult2.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult3.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult3.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult4.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult4.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult5.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult5.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult6.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult6.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/cult7.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/cult7.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/cult.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/cult.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug0.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug0.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug1.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug1.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug2.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug2.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug3.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug3.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug4.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug4.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug5.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug5.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug6.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug6.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/debug7.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/debug7.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/debug.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/debug.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond0.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond0.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond1.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond1.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond2.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond2.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond3.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond3.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond4.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond4.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond5.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond5.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond6.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond6.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/diamond7.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/diamond7.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/diamond.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/diamond.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold0.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold0.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold1.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold1.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold2.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold2.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold3.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold3.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold4.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold4.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold5.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold5.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold6.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold6.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/gold7.png b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/gold7.png rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png diff --git a/Resources/Textures/Buildings/Walls/gold.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/gold.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice0.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice0.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice1.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice1.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice2.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice2.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice3.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice3.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice4.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice4.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice5.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice5.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice6.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice6.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/ice7.png b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/ice7.png rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png diff --git a/Resources/Textures/Buildings/Walls/ice.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/ice.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json diff --git a/Resources/Textures/Buildings/low_wall.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_0.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_0.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_1.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_1.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_2.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_2.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_3.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_3.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_4.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_4.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_5.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_5.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_6.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_6.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_7.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_7.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_0.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_0.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_1.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_1.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_2.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_2.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_3.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_3.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_4.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_4.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_5.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_5.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_6.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_6.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png diff --git a/Resources/Textures/Buildings/low_wall.rsi/metal_over_7.png b/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png similarity index 100% rename from Resources/Textures/Buildings/low_wall.rsi/metal_over_7.png rename to Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal0.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal0.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal1.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal1.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal2.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal2.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal3.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal3.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal4.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal4.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal5.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal5.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal6.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal6.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png diff --git a/Resources/Textures/Buildings/Walls/metal.rsi/metal7.png b/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/metal.rsi/metal7.png rename to Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma0.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma0.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma1.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma1.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma2.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma2.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma3.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma3.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma4.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma4.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma5.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma5.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma6.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma6.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png diff --git a/Resources/Textures/Buildings/Walls/plasma.rsi/plasma7.png b/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plasma.rsi/plasma7.png rename to Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic0.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic0.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic1.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic1.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic2.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic2.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic3.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic3.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic4.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic4.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic5.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic5.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic6.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic6.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png diff --git a/Resources/Textures/Buildings/Walls/plastic.rsi/plastic7.png b/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/plastic.rsi/plastic7.png rename to Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted0.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted0.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted1.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted1.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted2.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted2.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted3.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted3.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted4.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted4.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted5.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted5.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted6.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted6.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png diff --git a/Resources/Textures/Buildings/Walls/riveted.rsi/riveted7.png b/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/riveted.rsi/riveted7.png rename to Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone0.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone0.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone1.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone1.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone2.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone2.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone3.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone3.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone4.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone4.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone5.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone5.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone6.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone6.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png diff --git a/Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone7.png b/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/sandstone.rsi/sandstone7.png rename to Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver0.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver0.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver1.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver1.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver2.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver2.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver3.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver3.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver4.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver4.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver5.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver5.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver6.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver6.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png diff --git a/Resources/Textures/Buildings/Walls/silver.rsi/silver7.png b/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/silver.rsi/silver7.png rename to Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-0.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-1.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-2.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-3.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-4.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-5.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_cult.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_cult.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_metal.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_metal.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over0.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over1.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over2.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over3.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over4.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over5.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over6.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/reinf_over7.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/rgeneric.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid0.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid0.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid1.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid1.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid2.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid2.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid3.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid3.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid4.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid4.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid5.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid5.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid6.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid6.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/solid7.png b/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/solid.rsi/solid7.png rename to Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium0.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium0.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium1.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium1.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium2.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium2.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium3.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium3.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium4.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium4.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium5.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium5.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium6.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium6.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png diff --git a/Resources/Textures/Buildings/Walls/uranium.rsi/uranium7.png b/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/uranium.rsi/uranium7.png rename to Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png diff --git a/Resources/Textures/Buildings/wall_girder.png b/Resources/Textures/Constructible/Structures/Walls/wall_girder.png similarity index 100% rename from Resources/Textures/Buildings/wall_girder.png rename to Resources/Textures/Constructible/Structures/Walls/wall_girder.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/full.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/full.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/meta.json b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood0.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood0.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood1.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood1.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood2.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood2.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood3.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood3.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood4.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood4.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood5.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood5.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood6.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood6.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png diff --git a/Resources/Textures/Buildings/Walls/wood.rsi/wood7.png b/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png similarity index 100% rename from Resources/Textures/Buildings/Walls/wood.rsi/wood7.png rename to Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/full.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/meta.json b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow0.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow0.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow1.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow1.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow2.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow2.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow3.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow3.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow4.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow4.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow5.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow5.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow6.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow6.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png diff --git a/Resources/Textures/Buildings/rwindow.rsi/rwindow7.png b/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png similarity index 100% rename from Resources/Textures/Buildings/rwindow.rsi/rwindow7.png rename to Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png diff --git a/Resources/Textures/Buildings/window.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/full.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png diff --git a/Resources/Textures/Buildings/window.rsi/meta.json b/Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/window.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json diff --git a/Resources/Textures/Buildings/window.rsi/window0.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window0.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png diff --git a/Resources/Textures/Buildings/window.rsi/window1.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window1.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png diff --git a/Resources/Textures/Buildings/window.rsi/window2.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window2.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png diff --git a/Resources/Textures/Buildings/window.rsi/window3.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window3.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png diff --git a/Resources/Textures/Buildings/window.rsi/window4.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window4.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png diff --git a/Resources/Textures/Buildings/window.rsi/window5.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window5.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png diff --git a/Resources/Textures/Buildings/window.rsi/window6.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window6.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png diff --git a/Resources/Textures/Buildings/window.rsi/window7.png b/Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png similarity index 100% rename from Resources/Textures/Buildings/window.rsi/window7.png rename to Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png diff --git a/Resources/Textures/Buildings/closet.rsi/abductor.png b/Resources/Textures/Constructible/Structures/closet.rsi/abductor.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/abductor.png rename to Resources/Textures/Constructible/Structures/closet.rsi/abductor.png diff --git a/Resources/Textures/Buildings/closet.rsi/abductor_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/abductor_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/abductor_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/abductor_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/agentbox.png b/Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/agentbox.png rename to Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png diff --git a/Resources/Textures/Buildings/closet.rsi/alien.png b/Resources/Textures/Constructible/Structures/closet.rsi/alien.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/alien.png rename to Resources/Textures/Constructible/Structures/closet.rsi/alien.png diff --git a/Resources/Textures/Buildings/closet.rsi/alien_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/alien_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/alien_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/alien_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/armory.png b/Resources/Textures/Constructible/Structures/closet.rsi/armory.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/armory.png rename to Resources/Textures/Constructible/Structures/closet.rsi/armory.png diff --git a/Resources/Textures/Buildings/closet.rsi/armory_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/armory_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/armory_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/armory_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/atmos.png b/Resources/Textures/Constructible/Structures/closet.rsi/atmos.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/atmos.png rename to Resources/Textures/Constructible/Structures/closet.rsi/atmos.png diff --git a/Resources/Textures/Buildings/closet.rsi/atmos_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/atmos_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/atmos_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/atmos_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/atmos_wardrobe_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/atmos_wardrobe_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_jan.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_jan.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_jan_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_jan_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_jan_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_jan_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_sec.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_sec.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_sec_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_sec_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_sec_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_sec_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_viro.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_viro.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_viro_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_viro_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bio_viro_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bio_viro_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/black_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/black_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/black_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/black_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/blue_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/blue_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bomb.png b/Resources/Textures/Constructible/Structures/closet.rsi/bomb.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bomb.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bomb.png diff --git a/Resources/Textures/Buildings/closet.rsi/bomb_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bomb_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/bomb_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/bomb_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cabinet.png b/Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cabinet.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png diff --git a/Resources/Textures/Buildings/closet.rsi/cabinet_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cabinet_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cabinet_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cabinet_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cap.png b/Resources/Textures/Constructible/Structures/closet.rsi/cap.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cap.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cap.png diff --git a/Resources/Textures/Buildings/closet.rsi/cap_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cap_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cap_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cap_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cardboard.png b/Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cardboard.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png diff --git a/Resources/Textures/Buildings/closet.rsi/cardboard_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cardboard_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cardboard_special.png b/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cardboard_special.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png diff --git a/Resources/Textures/Buildings/closet.rsi/cargo.png b/Resources/Textures/Constructible/Structures/closet.rsi/cargo.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cargo.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cargo.png diff --git a/Resources/Textures/Buildings/closet.rsi/cargo_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cargo_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cargo_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cargo_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/ce.png b/Resources/Textures/Constructible/Structures/closet.rsi/ce.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ce.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ce.png diff --git a/Resources/Textures/Buildings/closet.rsi/ce_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ce_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/ce_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ce_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/chemical_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/chemical_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cmo.png b/Resources/Textures/Constructible/Structures/closet.rsi/cmo.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cmo.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cmo.png diff --git a/Resources/Textures/Buildings/closet.rsi/cmo_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cmo_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cmo_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cmo_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cursed.png b/Resources/Textures/Constructible/Structures/closet.rsi/cursed.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cursed.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cursed.png diff --git a/Resources/Textures/Buildings/closet.rsi/cursed_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cursed_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/cursed_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cursed_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/cursed_whole.png b/Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/cursed_whole.png rename to Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png diff --git a/Resources/Textures/Buildings/closet.rsi/decursed.png b/Resources/Textures/Constructible/Structures/closet.rsi/decursed.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/decursed.png rename to Resources/Textures/Constructible/Structures/closet.rsi/decursed.png diff --git a/Resources/Textures/Buildings/closet.rsi/decursed_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/decursed_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/decursed_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/decursed_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/ecase.png b/Resources/Textures/Constructible/Structures/closet.rsi/ecase.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ecase.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ecase.png diff --git a/Resources/Textures/Buildings/closet.rsi/ecase_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ecase_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/ecase_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/ecase_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/egun.png b/Resources/Textures/Constructible/Structures/closet.rsi/egun.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/egun.png rename to Resources/Textures/Constructible/Structures/closet.rsi/egun.png diff --git a/Resources/Textures/Buildings/closet.rsi/emergency.png b/Resources/Textures/Constructible/Structures/closet.rsi/emergency.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/emergency.png rename to Resources/Textures/Constructible/Structures/closet.rsi/emergency.png diff --git a/Resources/Textures/Buildings/closet.rsi/emergency_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/emergency_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/emergency_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/emergency_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_elec_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_elec_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_rad_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_rad_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_secure.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_secure.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_secure_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_secure_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_secure_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_secure_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_tool_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_tool_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/eng_weld_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/eng_weld_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/fire.png b/Resources/Textures/Constructible/Structures/closet.rsi/fire.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/fire.png rename to Resources/Textures/Constructible/Structures/closet.rsi/fire.png diff --git a/Resources/Textures/Buildings/closet.rsi/fire_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/fire_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/fire_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/fire_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/freezer.png b/Resources/Textures/Constructible/Structures/closet.rsi/freezer.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/freezer.png rename to Resources/Textures/Constructible/Structures/closet.rsi/freezer.png diff --git a/Resources/Textures/Buildings/closet.rsi/freezer_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/freezer_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/freezer_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/freezer_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/generic.png b/Resources/Textures/Constructible/Structures/closet.rsi/generic.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/generic.png rename to Resources/Textures/Constructible/Structures/closet.rsi/generic.png diff --git a/Resources/Textures/Buildings/closet.rsi/generic_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/generic_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/generic_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/generic_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/green_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/green_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/green_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/green_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/grey_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/grey_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/hop.png b/Resources/Textures/Constructible/Structures/closet.rsi/hop.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hop.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hop.png diff --git a/Resources/Textures/Buildings/closet.rsi/hop_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hop_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/hop_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hop_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/hos.png b/Resources/Textures/Constructible/Structures/closet.rsi/hos.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hos.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hos.png diff --git a/Resources/Textures/Buildings/closet.rsi/hos_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hos_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/hos_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hos_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/hydro.png b/Resources/Textures/Constructible/Structures/closet.rsi/hydro.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hydro.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hydro.png diff --git a/Resources/Textures/Buildings/closet.rsi/hydro_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hydro_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/hydro_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/hydro_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/locked.png b/Resources/Textures/Constructible/Structures/closet.rsi/locked.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/locked.png rename to Resources/Textures/Constructible/Structures/closet.rsi/locked.png diff --git a/Resources/Textures/Buildings/closet.rsi/med.png b/Resources/Textures/Constructible/Structures/closet.rsi/med.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med.png diff --git a/Resources/Textures/Buildings/closet.rsi/med_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/med_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/med_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/med_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/med_secure.png b/Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med_secure.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png diff --git a/Resources/Textures/Buildings/closet.rsi/med_secure_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med_secure_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/med_secure_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/med_secure_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/meta.json b/Resources/Textures/Constructible/Structures/closet.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/meta.json rename to Resources/Textures/Constructible/Structures/closet.rsi/meta.json diff --git a/Resources/Textures/Buildings/closet.rsi/metalbox.png b/Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/metalbox.png rename to Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png diff --git a/Resources/Textures/Buildings/closet.rsi/metalbox_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/metalbox_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/mining.png b/Resources/Textures/Constructible/Structures/closet.rsi/mining.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/mining.png rename to Resources/Textures/Constructible/Structures/closet.rsi/mining.png diff --git a/Resources/Textures/Buildings/closet.rsi/mining_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/mining_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/mining_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/mining_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/mixed_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/mixed_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/oldcloset.png b/Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/oldcloset.png rename to Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png diff --git a/Resources/Textures/Buildings/closet.rsi/orange_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/orange_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/pink_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/pink_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/qm.png b/Resources/Textures/Constructible/Structures/closet.rsi/qm.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/qm.png rename to Resources/Textures/Constructible/Structures/closet.rsi/qm.png diff --git a/Resources/Textures/Buildings/closet.rsi/qm_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/qm_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/qm_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/qm_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/rd.png b/Resources/Textures/Constructible/Structures/closet.rsi/rd.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/rd.png rename to Resources/Textures/Constructible/Structures/closet.rsi/rd.png diff --git a/Resources/Textures/Buildings/closet.rsi/rd_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/rd_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/rd_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/rd_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/red_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/red_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/red_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/red_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/science.png b/Resources/Textures/Constructible/Structures/closet.rsi/science.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/science.png rename to Resources/Textures/Constructible/Structures/closet.rsi/science.png diff --git a/Resources/Textures/Buildings/closet.rsi/science_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/science_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/science_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/science_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/science_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/science_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/science_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/science_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/sec.png b/Resources/Textures/Constructible/Structures/closet.rsi/sec.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/sec.png rename to Resources/Textures/Constructible/Structures/closet.rsi/sec.png diff --git a/Resources/Textures/Buildings/closet.rsi/sec_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/sec_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/sec_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/sec_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/secure.png b/Resources/Textures/Constructible/Structures/closet.rsi/secure.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/secure.png rename to Resources/Textures/Constructible/Structures/closet.rsi/secure.png diff --git a/Resources/Textures/Buildings/closet.rsi/secure_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/secure_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/secure_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/secure_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/shotgun.png b/Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/shotgun.png rename to Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png diff --git a/Resources/Textures/Buildings/closet.rsi/shotguncase.png b/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/shotguncase.png rename to Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png diff --git a/Resources/Textures/Buildings/closet.rsi/shotguncase_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/shotguncase_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/shotguncase_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/shotguncase_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/sparking.png b/Resources/Textures/Constructible/Structures/closet.rsi/sparking.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/sparking.png rename to Resources/Textures/Constructible/Structures/closet.rsi/sparking.png diff --git a/Resources/Textures/Buildings/closet.rsi/syndicate.png b/Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/syndicate.png rename to Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png diff --git a/Resources/Textures/Buildings/closet.rsi/syndicate_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/syndicate_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/syndicate_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/syndicate_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/tac.png b/Resources/Textures/Constructible/Structures/closet.rsi/tac.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/tac.png rename to Resources/Textures/Constructible/Structures/closet.rsi/tac.png diff --git a/Resources/Textures/Buildings/closet.rsi/tac_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/tac_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/tac_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/tac_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/unlocked.png b/Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/unlocked.png rename to Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png diff --git a/Resources/Textures/Buildings/closet.rsi/warden.png b/Resources/Textures/Constructible/Structures/closet.rsi/warden.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/warden.png rename to Resources/Textures/Constructible/Structures/closet.rsi/warden.png diff --git a/Resources/Textures/Buildings/closet.rsi/warden_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/warden_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/warden_open.png b/Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/warden_open.png rename to Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png diff --git a/Resources/Textures/Buildings/closet.rsi/welded.png b/Resources/Textures/Constructible/Structures/closet.rsi/welded.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/welded.png rename to Resources/Textures/Constructible/Structures/closet.rsi/welded.png diff --git a/Resources/Textures/Buildings/closet.rsi/white_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/white_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/white_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/white_door.png diff --git a/Resources/Textures/Buildings/closet.rsi/yellow_door.png b/Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png similarity index 100% rename from Resources/Textures/Buildings/closet.rsi/yellow_door.png rename to Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png diff --git a/Resources/Textures/Tiles/asteroid_coarse_sand0.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_coarse_sand0.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png diff --git a/Resources/Textures/Tiles/asteroid_coarse_sand1.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_coarse_sand1.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png diff --git a/Resources/Textures/Tiles/asteroid_coarse_sand2.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_coarse_sand2.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png diff --git a/Resources/Textures/Tiles/asteroid_coarse_sand_dug.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_coarse_sand_dug.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png diff --git a/Resources/Textures/Tiles/asteroid_sand.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_sand.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png diff --git a/Resources/Textures/Tiles/asteroid_tile.png b/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png similarity index 100% rename from Resources/Textures/Tiles/asteroid_tile.png rename to Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter0.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter0.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter0.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter0.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter1.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter1.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter1.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter1.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter10.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter10.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter10.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter10.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter11.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter11.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter11.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter11.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter12.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter12.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter12.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter12.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter13.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter13.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter13.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter13.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter14.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter14.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter14.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter14.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter15.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter15.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter15.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter15.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter16.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter16.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter16.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter16.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter17.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter17.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter17.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter17.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter18.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter18.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter18.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter18.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter19.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter19.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter19.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter19.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter2.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter2.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter2.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter2.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter20.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter20.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter20.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter20.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter21.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter21.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter21.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter21.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter22.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter22.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter22.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter22.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter23.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter23.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter23.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter23.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter24.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter24.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter24.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter24.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter25.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter25.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter25.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter25.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter26.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter26.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter26.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter26.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter27.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter27.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter27.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter27.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter28.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter28.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter28.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter28.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter29.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter29.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter29.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter29.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter3.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter3.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter3.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter3.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter30.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter30.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter30.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter30.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter31.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter31.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter31.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter31.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter32.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter32.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter32.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter32.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter33.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter33.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter33.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter33.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter34.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter34.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter34.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter34.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter35.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter35.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter35.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter35.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter4.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter4.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter4.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter4.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter5.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter5.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter5.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter5.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter6.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter6.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter6.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter6.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter7.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter7.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter7.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter7.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter8.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter8.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter8.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter8.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter9.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter9.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter9.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter9.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter_corners.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter_corners.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter_corners.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter_corners.png diff --git a/Resources/Textures/Tiles/Hull/hullcenter_edges.png b/Resources/Textures/Constructible/Tiles/Hull/hullcenter_edges.png similarity index 100% rename from Resources/Textures/Tiles/Hull/hullcenter_edges.png rename to Resources/Textures/Constructible/Tiles/Hull/hullcenter_edges.png diff --git a/Resources/Textures/Tiles/carpet.png b/Resources/Textures/Constructible/Tiles/carpet.png similarity index 100% rename from Resources/Textures/Tiles/carpet.png rename to Resources/Textures/Constructible/Tiles/carpet.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_0.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_0.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_1.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_1.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_2.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_2.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_3.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_3.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_4.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_4.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_5.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_5.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_6.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_6.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_7.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_7.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/catwalk_preview.png b/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/catwalk_preview.png rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png diff --git a/Resources/Textures/Buildings/catwalk.rsi/meta.json b/Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json similarity index 100% rename from Resources/Textures/Buildings/catwalk.rsi/meta.json rename to Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Constructible/Tiles/copyright.txt similarity index 100% rename from Resources/Textures/Tiles/copyright.txt rename to Resources/Textures/Constructible/Tiles/copyright.txt diff --git a/Resources/Textures/Tiles/dark.png b/Resources/Textures/Constructible/Tiles/dark.png similarity index 100% rename from Resources/Textures/Tiles/dark.png rename to Resources/Textures/Constructible/Tiles/dark.png diff --git a/Resources/Textures/Tiles/elevator_shaft.png b/Resources/Textures/Constructible/Tiles/elevator_shaft.png similarity index 100% rename from Resources/Textures/Tiles/elevator_shaft.png rename to Resources/Textures/Constructible/Tiles/elevator_shaft.png diff --git a/Resources/Textures/Tiles/freezer.png b/Resources/Textures/Constructible/Tiles/freezer.png similarity index 100% rename from Resources/Textures/Tiles/freezer.png rename to Resources/Textures/Constructible/Tiles/freezer.png diff --git a/Resources/Textures/Tiles/gold.png b/Resources/Textures/Constructible/Tiles/gold.png similarity index 100% rename from Resources/Textures/Tiles/gold.png rename to Resources/Textures/Constructible/Tiles/gold.png diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Constructible/Tiles/green_circuit.png similarity index 100% rename from Resources/Textures/Tiles/green_circuit.png rename to Resources/Textures/Constructible/Tiles/green_circuit.png diff --git a/Resources/Textures/Tiles/hydro.png b/Resources/Textures/Constructible/Tiles/hydro.png similarity index 100% rename from Resources/Textures/Tiles/hydro.png rename to Resources/Textures/Constructible/Tiles/hydro.png diff --git a/Resources/Textures/Tiles/lino.png b/Resources/Textures/Constructible/Tiles/lino.png similarity index 100% rename from Resources/Textures/Tiles/lino.png rename to Resources/Textures/Constructible/Tiles/lino.png diff --git a/Resources/Textures/Tiles/mono.png b/Resources/Textures/Constructible/Tiles/mono.png similarity index 100% rename from Resources/Textures/Tiles/mono.png rename to Resources/Textures/Constructible/Tiles/mono.png diff --git a/Resources/Textures/Tiles/plating.png b/Resources/Textures/Constructible/Tiles/plating.png similarity index 100% rename from Resources/Textures/Tiles/plating.png rename to Resources/Textures/Constructible/Tiles/plating.png diff --git a/Resources/Textures/Tiles/reinforced.png b/Resources/Textures/Constructible/Tiles/reinforced.png similarity index 100% rename from Resources/Textures/Tiles/reinforced.png rename to Resources/Textures/Constructible/Tiles/reinforced.png diff --git a/Resources/Textures/Tiles/rock_vault.png b/Resources/Textures/Constructible/Tiles/rock_vault.png similarity index 100% rename from Resources/Textures/Tiles/rock_vault.png rename to Resources/Textures/Constructible/Tiles/rock_vault.png diff --git a/Resources/Textures/Tiles/showroom.png b/Resources/Textures/Constructible/Tiles/showroom.png similarity index 100% rename from Resources/Textures/Tiles/showroom.png rename to Resources/Textures/Constructible/Tiles/showroom.png diff --git a/Resources/Textures/Tiles/snow.png b/Resources/Textures/Constructible/Tiles/snow.png similarity index 100% rename from Resources/Textures/Tiles/snow.png rename to Resources/Textures/Constructible/Tiles/snow.png diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Constructible/Tiles/steel.png similarity index 100% rename from Resources/Textures/Tiles/steel.png rename to Resources/Textures/Constructible/Tiles/steel.png diff --git a/Resources/Textures/Tiles/steel_dirty.png b/Resources/Textures/Constructible/Tiles/steel_dirty.png similarity index 100% rename from Resources/Textures/Tiles/steel_dirty.png rename to Resources/Textures/Constructible/Tiles/steel_dirty.png diff --git a/Resources/Textures/Tiles/tech_maint.png b/Resources/Textures/Constructible/Tiles/tech_maint.png similarity index 100% rename from Resources/Textures/Tiles/tech_maint.png rename to Resources/Textures/Constructible/Tiles/tech_maint.png diff --git a/Resources/Textures/Tiles/underplating.png b/Resources/Textures/Constructible/Tiles/underplating.png similarity index 100% rename from Resources/Textures/Tiles/underplating.png rename to Resources/Textures/Constructible/Tiles/underplating.png diff --git a/Resources/Textures/Tiles/white.png b/Resources/Textures/Constructible/Tiles/white.png similarity index 100% rename from Resources/Textures/Tiles/white.png rename to Resources/Textures/Constructible/Tiles/white.png diff --git a/Resources/Textures/Tiles/wood.png b/Resources/Textures/Constructible/Tiles/wood.png similarity index 100% rename from Resources/Textures/Tiles/wood.png rename to Resources/Textures/Constructible/Tiles/wood.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/bite.png b/Resources/Textures/Effects/arcs.rsi/bite.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/bite.png rename to Resources/Textures/Effects/arcs.rsi/bite.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/claw.png b/Resources/Textures/Effects/arcs.rsi/claw.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/claw.png rename to Resources/Textures/Effects/arcs.rsi/claw.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/disarm.png b/Resources/Textures/Effects/arcs.rsi/disarm.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/disarm.png rename to Resources/Textures/Effects/arcs.rsi/disarm.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/fist.png b/Resources/Textures/Effects/arcs.rsi/fist.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/fist.png rename to Resources/Textures/Effects/arcs.rsi/fist.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/kick.png b/Resources/Textures/Effects/arcs.rsi/kick.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/kick.png rename to Resources/Textures/Effects/arcs.rsi/kick.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json b/Resources/Textures/Effects/arcs.rsi/meta.json similarity index 88% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json rename to Resources/Textures/Effects/arcs.rsi/meta.json index 116f323760..0d9524fb4d 100644 --- a/Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json +++ b/Resources/Textures/Effects/arcs.rsi/meta.json @@ -76,6 +76,18 @@ 0.1 ] ] + }, + { + "name": "spear", + "directions": 1 + }, + { + "name": "slash", + "directions": 1 + }, + { + "name": "fist", + "directions": 1 } ] } diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/punch.png b/Resources/Textures/Effects/arcs.rsi/punch.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/punch.png rename to Resources/Textures/Effects/arcs.rsi/punch.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/slash.png b/Resources/Textures/Effects/arcs.rsi/slash.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/slash.png rename to Resources/Textures/Effects/arcs.rsi/slash.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/smash.png b/Resources/Textures/Effects/arcs.rsi/smash.png similarity index 100% rename from Resources/Textures/Effects/weapons/tg_arcs.rsi/smash.png rename to Resources/Textures/Effects/arcs.rsi/smash.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/spear.png b/Resources/Textures/Effects/arcs.rsi/spear.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/spear.png rename to Resources/Textures/Effects/arcs.rsi/spear.png diff --git a/Resources/Textures/Effects/explosion.png b/Resources/Textures/Effects/explosion.rsi/explosion.png similarity index 100% rename from Resources/Textures/Effects/explosion.png rename to Resources/Textures/Effects/explosion.rsi/explosion.png diff --git a/Resources/Textures/UserInterface/Inventory/back.png b/Resources/Textures/Interface/Inventory/back.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/back.png rename to Resources/Textures/Interface/Inventory/back.png diff --git a/Resources/Textures/UserInterface/Inventory/belt.png b/Resources/Textures/Interface/Inventory/belt.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/belt.png rename to Resources/Textures/Interface/Inventory/belt.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-0.png b/Resources/Textures/Interface/Inventory/cooldown-0.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-0.png rename to Resources/Textures/Interface/Inventory/cooldown-0.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-1.png b/Resources/Textures/Interface/Inventory/cooldown-1.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-1.png rename to Resources/Textures/Interface/Inventory/cooldown-1.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-2.png b/Resources/Textures/Interface/Inventory/cooldown-2.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-2.png rename to Resources/Textures/Interface/Inventory/cooldown-2.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-3.png b/Resources/Textures/Interface/Inventory/cooldown-3.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-3.png rename to Resources/Textures/Interface/Inventory/cooldown-3.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-4.png b/Resources/Textures/Interface/Inventory/cooldown-4.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-4.png rename to Resources/Textures/Interface/Inventory/cooldown-4.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-5.png b/Resources/Textures/Interface/Inventory/cooldown-5.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-5.png rename to Resources/Textures/Interface/Inventory/cooldown-5.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-6.png b/Resources/Textures/Interface/Inventory/cooldown-6.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-6.png rename to Resources/Textures/Interface/Inventory/cooldown-6.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown-7.png b/Resources/Textures/Interface/Inventory/cooldown-7.png similarity index 100% rename from Resources/Textures/UserInterface/Inventory/cooldown-7.png rename to Resources/Textures/Interface/Inventory/cooldown-7.png diff --git a/Resources/Textures/UserInterface/Inventory/cooldown.svg b/Resources/Textures/Interface/Inventory/cooldown.svg similarity index 97% rename from Resources/Textures/UserInterface/Inventory/cooldown.svg rename to Resources/Textures/Interface/Inventory/cooldown.svg index 3248c426a0..14e8ca9a28 100644 --- a/Resources/Textures/UserInterface/Inventory/cooldown.svg +++ b/Resources/Textures/Interface/Inventory/cooldown.svg @@ -16,7 +16,7 @@ id="svg8" inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="cooldown.svg" - inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/UserInterface/Inventory/cooldown-7.png" + inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/Interface/Inventory/cooldown-7.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> diff --git a/Resources/Nano/button.svg.96dpi.png b/Resources/Textures/Interface/Nano/button.svg.96dpi.png similarity index 100% rename from Resources/Nano/button.svg.96dpi.png rename to Resources/Textures/Interface/Nano/button.svg.96dpi.png diff --git a/Resources/Nano/checkbox_checked.svg b/Resources/Textures/Interface/Nano/checkbox_checked.svg similarity index 100% rename from Resources/Nano/checkbox_checked.svg rename to Resources/Textures/Interface/Nano/checkbox_checked.svg diff --git a/Resources/Nano/checkbox_checked.svg.96dpi.png b/Resources/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png similarity index 100% rename from Resources/Nano/checkbox_checked.svg.96dpi.png rename to Resources/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png diff --git a/Resources/Nano/checkbox_checked.svg.96dpi.png.yml b/Resources/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png.yml similarity index 100% rename from Resources/Nano/checkbox_checked.svg.96dpi.png.yml rename to Resources/Textures/Interface/Nano/checkbox_checked.svg.96dpi.png.yml diff --git a/Resources/Nano/checkbox_unchecked.svg b/Resources/Textures/Interface/Nano/checkbox_unchecked.svg similarity index 100% rename from Resources/Nano/checkbox_unchecked.svg rename to Resources/Textures/Interface/Nano/checkbox_unchecked.svg diff --git a/Resources/Nano/checkbox_unchecked.svg.96dpi.png b/Resources/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png similarity index 100% rename from Resources/Nano/checkbox_unchecked.svg.96dpi.png rename to Resources/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png diff --git a/Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml b/Resources/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png.yml similarity index 100% rename from Resources/Nano/checkbox_unchecked.svg.96dpi.png.yml rename to Resources/Textures/Interface/Nano/checkbox_unchecked.svg.96dpi.png.yml diff --git a/Resources/Nano/cross.svg b/Resources/Textures/Interface/Nano/cross.svg similarity index 98% rename from Resources/Nano/cross.svg rename to Resources/Textures/Interface/Nano/cross.svg index 0fc6939a83..b91b944e56 100644 --- a/Resources/Nano/cross.svg +++ b/Resources/Textures/Interface/Nano/cross.svg @@ -13,7 +13,7 @@ height="22.000004" width="22" sodipodi:docname="cross.svg" - inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Nano/cross.svg.png" + inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Textures/Interface/Nano/cross.svg.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.4 5da689c313, 2019-01-14"> diff --git a/Resources/Nano/cross.svg.png b/Resources/Textures/Interface/Nano/cross.svg.png similarity index 100% rename from Resources/Nano/cross.svg.png rename to Resources/Textures/Interface/Nano/cross.svg.png diff --git a/Resources/Nano/cross.svg.png.yml b/Resources/Textures/Interface/Nano/cross.svg.png.yml similarity index 100% rename from Resources/Nano/cross.svg.png.yml rename to Resources/Textures/Interface/Nano/cross.svg.png.yml diff --git a/Resources/Nano/inverted_triangle.svg b/Resources/Textures/Interface/Nano/inverted_triangle.svg similarity index 100% rename from Resources/Nano/inverted_triangle.svg rename to Resources/Textures/Interface/Nano/inverted_triangle.svg diff --git a/Resources/Nano/inverted_triangle.svg.png b/Resources/Textures/Interface/Nano/inverted_triangle.svg.png similarity index 100% rename from Resources/Nano/inverted_triangle.svg.png rename to Resources/Textures/Interface/Nano/inverted_triangle.svg.png diff --git a/Resources/Nano/item_status_left.svg b/Resources/Textures/Interface/Nano/item_status_left.svg similarity index 99% rename from Resources/Nano/item_status_left.svg rename to Resources/Textures/Interface/Nano/item_status_left.svg index 25c14b0ecd..519d00a68a 100644 --- a/Resources/Nano/item_status_left.svg +++ b/Resources/Textures/Interface/Nano/item_status_left.svg @@ -16,7 +16,7 @@ id="svg8" inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="item_status_left.svg" - inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Nano/item_status_left.svg.96dpi.png" + inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png" inkscape:export-xdpi="96.000008" inkscape:export-ydpi="96.000008"> diff --git a/Resources/Nano/nanoheading.svg.96dpi.png b/Resources/Textures/Interface/Nano/nanoheading.svg.96dpi.png similarity index 100% rename from Resources/Nano/nanoheading.svg.96dpi.png rename to Resources/Textures/Interface/Nano/nanoheading.svg.96dpi.png diff --git a/Resources/Nano/placeholder.png b/Resources/Textures/Interface/Nano/placeholder.png similarity index 100% rename from Resources/Nano/placeholder.png rename to Resources/Textures/Interface/Nano/placeholder.png diff --git a/Resources/Nano/slider_fill.svg b/Resources/Textures/Interface/Nano/slider_fill.svg similarity index 97% rename from Resources/Nano/slider_fill.svg rename to Resources/Textures/Interface/Nano/slider_fill.svg index c162e329bf..615a923d6b 100644 --- a/Resources/Nano/slider_fill.svg +++ b/Resources/Textures/Interface/Nano/slider_fill.svg @@ -16,7 +16,7 @@ id="svg5439" inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="slider_fill.svg" - inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Nano/slider_fill.svg.96dpi.png" + inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> diff --git a/Resources/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png b/Resources/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png rename to Resources/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png.yml b/Resources/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png.yml similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_1_copper.svg.96dpi.png.yml rename to Resources/Textures/Interface/WireHacking/wire_1_copper.svg.96dpi.png.yml diff --git a/Resources/Textures/UserInterface/WireHacking/wire_1_cut.svg b/Resources/Textures/Interface/WireHacking/wire_1_cut.svg similarity index 93% rename from Resources/Textures/UserInterface/WireHacking/wire_1_cut.svg rename to Resources/Textures/Interface/WireHacking/wire_1_cut.svg index 257897a634..faa7f64e2f 100644 --- a/Resources/Textures/UserInterface/WireHacking/wire_1_cut.svg +++ b/Resources/Textures/Interface/WireHacking/wire_1_cut.svg @@ -9,7 +9,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="96" inkscape:export-xdpi="96" - inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/UserInterface/WireHacking/wire_1_cut.svg.96dpi.png" + inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/Interface/WireHacking/wire_1_cut.svg.96dpi.png" sodipodi:docname="wire_1_cut.svg" inkscape:version="1.0 (4035a4fb49, 2020-05-01)" id="svg2245" @@ -59,7 +59,7 @@ diff --git a/Resources/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png b/Resources/Textures/Interface/WireHacking/wire_2.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png rename to Resources/Textures/Interface/WireHacking/wire_2.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png.yml b/Resources/Textures/Interface/WireHacking/wire_2.svg.96dpi.png.yml similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_2.svg.96dpi.png.yml rename to Resources/Textures/Interface/WireHacking/wire_2.svg.96dpi.png.yml diff --git a/Resources/Textures/UserInterface/WireHacking/wire_2_copper.svg b/Resources/Textures/Interface/WireHacking/wire_2_copper.svg similarity index 93% rename from Resources/Textures/UserInterface/WireHacking/wire_2_copper.svg rename to Resources/Textures/Interface/WireHacking/wire_2_copper.svg index 68737e7245..e4de96805a 100644 --- a/Resources/Textures/UserInterface/WireHacking/wire_2_copper.svg +++ b/Resources/Textures/Interface/WireHacking/wire_2_copper.svg @@ -9,7 +9,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="96" inkscape:export-xdpi="96" - inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/UserInterface/WireHacking/wire_copper_2.svg.96dpi.png" + inkscape:export-filename="/ssdhome/pj/Projects/space-station-14-content/Resources/Textures/Interface/WireHacking/wire_copper_2.svg.96dpi.png" sodipodi:docname="wire_2_copper.svg" inkscape:version="1.0 (4035a4fb49, 2020-05-01)" id="svg2245" @@ -59,7 +59,7 @@ diff --git a/Resources/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png b/Resources/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png rename to Resources/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png.yml b/Resources/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png.yml similarity index 100% rename from Resources/Textures/UserInterface/WireHacking/wire_2_cut.svg.96dpi.png.yml rename to Resources/Textures/Interface/WireHacking/wire_2_cut.svg.96dpi.png.yml diff --git a/Resources/Textures/UserInterface/character.svg b/Resources/Textures/Interface/character.svg similarity index 100% rename from Resources/Textures/UserInterface/character.svg rename to Resources/Textures/Interface/character.svg diff --git a/Resources/Textures/UserInterface/character.svg.96dpi.png b/Resources/Textures/Interface/character.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/character.svg.96dpi.png rename to Resources/Textures/Interface/character.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/hamburger.svg b/Resources/Textures/Interface/hamburger.svg similarity index 100% rename from Resources/Textures/UserInterface/hamburger.svg rename to Resources/Textures/Interface/hamburger.svg diff --git a/Resources/Textures/UserInterface/hamburger.svg.96dpi.png b/Resources/Textures/Interface/hamburger.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/hamburger.svg.96dpi.png rename to Resources/Textures/Interface/hamburger.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/hammer.svg b/Resources/Textures/Interface/hammer.svg similarity index 100% rename from Resources/Textures/UserInterface/hammer.svg rename to Resources/Textures/Interface/hammer.svg diff --git a/Resources/Textures/UserInterface/hammer.svg.96dpi.png b/Resources/Textures/Interface/hammer.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/hammer.svg.96dpi.png rename to Resources/Textures/Interface/hammer.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/handsbox.png b/Resources/Textures/Interface/handsbox.png similarity index 100% rename from Resources/Textures/UserInterface/handsbox.png rename to Resources/Textures/Interface/handsbox.png diff --git a/Resources/Textures/UserInterface/inventory.svg b/Resources/Textures/Interface/inventory.svg similarity index 100% rename from Resources/Textures/UserInterface/inventory.svg rename to Resources/Textures/Interface/inventory.svg diff --git a/Resources/Textures/UserInterface/inventory.svg.96dpi.png b/Resources/Textures/Interface/inventory.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/inventory.svg.96dpi.png rename to Resources/Textures/Interface/inventory.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/sandbox.svg b/Resources/Textures/Interface/sandbox.svg similarity index 100% rename from Resources/Textures/UserInterface/sandbox.svg rename to Resources/Textures/Interface/sandbox.svg diff --git a/Resources/Textures/UserInterface/sandbox.svg.96dpi.png b/Resources/Textures/Interface/sandbox.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/sandbox.svg.96dpi.png rename to Resources/Textures/Interface/sandbox.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/students-cap.svg b/Resources/Textures/Interface/students-cap.svg similarity index 100% rename from Resources/Textures/UserInterface/students-cap.svg rename to Resources/Textures/Interface/students-cap.svg diff --git a/Resources/Textures/UserInterface/students-cap.svg.96dpi.png b/Resources/Textures/Interface/students-cap.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/students-cap.svg.96dpi.png rename to Resources/Textures/Interface/students-cap.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/target-doll-high.svg b/Resources/Textures/Interface/target-doll-high.svg similarity index 100% rename from Resources/Textures/UserInterface/target-doll-high.svg rename to Resources/Textures/Interface/target-doll-high.svg diff --git a/Resources/Textures/UserInterface/target-doll-high.svg.96dpi.png b/Resources/Textures/Interface/target-doll-high.svg.96dpi.png similarity index 100% rename from Resources/Textures/UserInterface/target-doll-high.svg.96dpi.png rename to Resources/Textures/Interface/target-doll-high.svg.96dpi.png diff --git a/Resources/Textures/UserInterface/target-doll-low.svg b/Resources/Textures/Interface/target-doll-low.svg similarity index 97% rename from Resources/Textures/UserInterface/target-doll-low.svg rename to Resources/Textures/Interface/target-doll-low.svg index c1f40a97a1..8b77da8529 100644 --- a/Resources/Textures/UserInterface/target-doll-low.svg +++ b/Resources/Textures/Interface/target-doll-low.svg @@ -16,7 +16,7 @@ id="svg2285" inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="target-doll-low.svg" - inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Textures/UserInterface/target-doll-low.svg.96dpi.png" + inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Textures/Interface/target-doll-low.svg.96dpi.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96">