From 9b1142973ec39a5bd6426bd6b9d9e266e0e39072 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Date: Tue, 9 Feb 2021 19:05:19 +0100 Subject: [PATCH] Renames phoron to plasma everywhere in the codebase and replaces sprites. (#3110) --- .../Construction/ConstructionMenu.xaml.cs | 4 +- .../Components/Power/AutolatheVisualizer.cs | 8 ++-- .../Components/Power/ProtolatheVisualizer.cs | 8 ++-- ...nFireReaction.cs => PlasmaFireReaction.cs} | 36 +++++++++--------- Content.Server/Atmos/TileAtmosphere.cs | 8 ++-- Content.Server/Construction/StackHelpers.cs | 4 +- .../Components/Atmos/FlammableComponent.cs | 2 +- .../Atmos/Piping/GasFilterComponent.cs | 2 +- .../Components/Power/PowerCellComponent.cs | 4 +- Content.Shared/Atmos/Atmospherics.cs | 12 +++--- .../Components/Power/SharedLatheComponent.cs | 2 +- .../Components/SharedStackComponent.cs | 2 +- Resources/Prototypes/Atmospherics/gases.yml | 6 +-- .../Prototypes/Atmospherics/reactions.yml | 8 ++-- .../Prototypes/Catalog/Fills/gas_tanks.yml | 10 ++--- .../Constructible/Ground/gascanisters.yml | 12 +++--- .../Storage/Crates/crate_types.yml | 18 ++++----- .../Entities/Constructible/Walls/signs.yml | 6 +-- .../Entities/Constructible/Walls/windows.yml | 12 +++--- .../Entities/Objects/Misc/material_stacks.yml | 24 ++++++------ .../Entities/Objects/Specific/janitor.yml | 2 +- .../Entities/Objects/Tools/gas_tanks.yml | 10 ++--- .../Prototypes/Entities/Objects/shards.yml | 8 ++-- Resources/Prototypes/Reagents/chemicals.yml | 4 +- Resources/Prototypes/Reagents/materials.yml | 6 +-- .../Recipes/Construction/Graphs/window.yml | 10 ++--- .../Recipes/Construction/structures.yml | 8 ++-- .../Prototypes/Recipes/Reactions/medicine.yml | 10 ++--- .../{atmos_phoron.png => atmos_plasma.png} | Bin .../Constructible/Misc/decals.rsi/meta.json | 2 +- .../autolathe_inserting_plasma_sheet.png | Bin 0 -> 1789 bytes .../Power/autolathe.rsi/meta.json | 16 ++++++++ .../{phoron.rsi => plasma.rsi}/locked.png | Bin .../{phoron.rsi => plasma.rsi}/meta.json | 8 ++-- .../Crates/{phoron.rsi => plasma.rsi}/off.png | Bin .../plasmacrate.png} | Bin .../plasmacrate_door.png} | Bin .../plasmacrate_icon.png} | Bin .../plasmacrate_open.png} | Bin .../{phoron.rsi => plasma.rsi}/sparking.png | Bin .../{phoron.rsi => plasma.rsi}/unlocked.png | Bin .../{phoron.rsi => plasma.rsi}/welded.png | Bin .../Windows/phoron_window.rsi/full.png | Bin 523 -> 0 bytes .../Windows/phoron_window.rsi/pwindow0.png | Bin 775 -> 0 bytes .../Windows/phoron_window.rsi/pwindow1.png | Bin 472 -> 0 bytes .../Windows/phoron_window.rsi/pwindow2.png | Bin 775 -> 0 bytes .../Windows/phoron_window.rsi/pwindow3.png | Bin 472 -> 0 bytes .../Windows/phoron_window.rsi/pwindow4.png | Bin 491 -> 0 bytes .../Windows/phoron_window.rsi/pwindow5.png | Bin 892 -> 0 bytes .../Windows/phoron_window.rsi/pwindow6.png | Bin 491 -> 0 bytes .../Windows/phoron_window.rsi/pwindow7.png | Bin 325 -> 0 bytes .../Windows/plasma_window.rsi/full.png | Bin 0 -> 6759 bytes .../meta.json | 0 .../Windows/plasma_window.rsi/pwindow0.png | Bin 0 -> 522 bytes .../Windows/plasma_window.rsi/pwindow1.png | Bin 0 -> 345 bytes .../Windows/plasma_window.rsi/pwindow2.png | Bin 0 -> 522 bytes .../Windows/plasma_window.rsi/pwindow3.png | Bin 0 -> 345 bytes .../Windows/plasma_window.rsi/pwindow4.png | Bin 0 -> 349 bytes .../Windows/plasma_window.rsi/pwindow5.png | Bin 0 -> 512 bytes .../Windows/plasma_window.rsi/pwindow6.png | Bin 0 -> 349 bytes .../Windows/plasma_window.rsi/pwindow7.png | Bin 0 -> 244 bytes .../Effects/atmospherics.rsi/meta.json | 2 +- .../Effects/atmospherics.rsi/phoron.png | Bin 1909 -> 0 bytes .../Effects/atmospherics.rsi/plasma.png | Bin 0 -> 1953 bytes .../{phoron_old.png => plasma_old.png} | Bin .../Objects/Materials/materials.rsi/meta.json | 3 ++ .../Materials/materials.rsi/plasma_ore.png | Bin 0 -> 501 bytes .../Objects/Materials/sheets.rsi/meta.json | 6 +++ .../Objects/Materials/sheets.rsi/plasma.png | Bin 0 -> 420 bytes .../Materials/sheets.rsi/plasmaglass.png | Bin 0 -> 676 bytes .../equipped-BELT.png | Bin .../Tanks/{phoron.rsi => plasma.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{phoron.rsi => plasma.rsi}/meta.json | 0 75 files changed, 154 insertions(+), 129 deletions(-) rename Content.Server/Atmos/Reactions/{PhoronFireReaction.cs => PlasmaFireReaction.cs} (69%) rename Resources/Textures/Constructible/Misc/decals.rsi/{atmos_phoron.png => atmos_plasma.png} (100%) create mode 100644 Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/locked.png (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/meta.json (87%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/off.png (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi/phoroncrate.png => plasma.rsi/plasmacrate.png} (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi/phoroncrate_door.png => plasma.rsi/plasmacrate_door.png} (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi/phoroncrate_icon.png => plasma.rsi/plasmacrate_icon.png} (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi/phoroncrate_open.png => plasma.rsi/plasmacrate_open.png} (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/sparking.png (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/unlocked.png (100%) rename Resources/Textures/Constructible/Storage/Crates/{phoron.rsi => plasma.rsi}/welded.png (100%) delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png delete mode 100644 Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png rename Resources/Textures/Constructible/Structures/Windows/{phoron_window.rsi => plasma_window.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png create mode 100644 Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png delete mode 100644 Resources/Textures/Effects/atmospherics.rsi/phoron.png create mode 100644 Resources/Textures/Effects/atmospherics.rsi/plasma.png rename Resources/Textures/Effects/atmospherics.rsi/{phoron_old.png => plasma_old.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png create mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/plasma.png create mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png rename Resources/Textures/Objects/Tanks/{phoron.rsi => plasma.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Objects/Tanks/{phoron.rsi => plasma.rsi}/icon.png (100%) rename Resources/Textures/Objects/Tanks/{phoron.rsi => plasma.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/Tanks/{phoron.rsi => plasma.rsi}/inhand-right.png (100%) rename Resources/Textures/Objects/Tanks/{phoron.rsi => plasma.rsi}/meta.json (100%) diff --git a/Content.Client/Construction/ConstructionMenu.xaml.cs b/Content.Client/Construction/ConstructionMenu.xaml.cs index ccb631586f..e2da520180 100644 --- a/Content.Client/Construction/ConstructionMenu.xaml.cs +++ b/Content.Client/Construction/ConstructionMenu.xaml.cs @@ -182,8 +182,8 @@ namespace Content.Client.Construction case StackType.Plasteel: return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasteel.png"); - case StackType.Phoron: - return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/phoron.png"); + case StackType.Plasma: + return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasma.png"); case StackType.Cable: return _resourceCache.GetTexture("/Textures/Objects/Tools/cables.rsi/coil-30.png"); diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs index 757dddbc28..edb4f3c1c1 100644 --- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs @@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power private Animation _insertingMetalAnimation; private Animation _insertingGlassAnimation; private Animation _insertingGoldAnimation; - private Animation _insertingPhoronAnimation; + private Animation _insertingPlasmaAnimation; public override void LoadData(YamlMappingNode node) { @@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power _insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f); _insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f); _insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f); - _insertingPhoronAnimation = PopulateAnimation("autolathe_inserting_phoron_sheet", "autolathe_inserting_unlit", 0.9f); + _insertingPlasmaAnimation = PopulateAnimation("autolathe_inserting_plasma_sheet", "autolathe_inserting_unlit", 0.9f); } private Animation PopulateAnimation(string sprite, string spriteUnlit, float length) @@ -103,10 +103,10 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Play(_insertingGoldAnimation, AnimationKey); } break; - case LatheVisualState.InsertingPhoron: + case LatheVisualState.InsertingPlasma: if (!animPlayer.HasRunningAnimation(AnimationKey)) { - animPlayer.Play(_insertingPhoronAnimation, AnimationKey); + animPlayer.Play(_insertingPlasmaAnimation, AnimationKey); } break; default: diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs index 9bce43d0ee..46b55dfade 100644 --- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs @@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power private Animation _insertingMetalAnimation; private Animation _insertingGlassAnimation; private Animation _insertingGoldAnimation; - private Animation _insertingPhoronAnimation; + private Animation _insertingPlasmaAnimation; public override void LoadData(YamlMappingNode node) { @@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power _insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f); _insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f); _insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f); - _insertingPhoronAnimation = PopulateAnimation("protolathe_phoron", 0.9f); + _insertingPlasmaAnimation = PopulateAnimation("protolathe_plasma", 0.9f); } private Animation PopulateAnimation(string sprite, float length) @@ -99,10 +99,10 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Play(_insertingGoldAnimation, AnimationKey); } break; - case LatheVisualState.InsertingPhoron: + case LatheVisualState.InsertingPlasma: if (!animPlayer.HasRunningAnimation(AnimationKey)) { - animPlayer.Play(_insertingPhoronAnimation, AnimationKey); + animPlayer.Play(_insertingPlasmaAnimation, AnimationKey); } break; default: diff --git a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs similarity index 69% rename from Content.Server/Atmos/Reactions/PhoronFireReaction.cs rename to Content.Server/Atmos/Reactions/PlasmaFireReaction.cs index d08f840293..77bcf4647d 100644 --- a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs @@ -12,7 +12,7 @@ using Robust.Shared.Serialization; namespace Content.Server.Atmos.Reactions { [UsedImplicitly] - public class PhoronFireReaction : IGasReactionEffect + public class PlasmaFireReaction : IGasReactionEffect { public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup) { @@ -21,43 +21,43 @@ namespace Content.Server.Atmos.Reactions var temperature = mixture.Temperature; var location = holder as TileAtmosphere; - // More phoron released at higher temperatures + // More plasma released at higher temperatures var temperatureScale = 0f; var superSaturation = false; - if (temperature > Atmospherics.PhoronUpperTemperature) + if (temperature > Atmospherics.PlasmaUpperTemperature) temperatureScale = 1f; else - temperatureScale = (temperature - Atmospherics.PhoronMinimumBurnTemperature) / - (Atmospherics.PhoronUpperTemperature - Atmospherics.PhoronMinimumBurnTemperature); + temperatureScale = (temperature - Atmospherics.PlasmaMinimumBurnTemperature) / + (Atmospherics.PlasmaUpperTemperature - Atmospherics.PlasmaMinimumBurnTemperature); if (temperatureScale > 0f) { - var phoronBurnRate = 0f; + var plasmaBurnRate = 0f; var oxygenBurnRate = Atmospherics.OxygenBurnRateBase - temperatureScale; - if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Phoron) > + if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Plasma) > Atmospherics.SuperSaturationThreshold) superSaturation = true; if (mixture.GetMoles(Gas.Oxygen) > - mixture.GetMoles(Gas.Phoron) * Atmospherics.PhoronOxygenFullburn) - phoronBurnRate = (mixture.GetMoles(Gas.Phoron) * temperatureScale) / - Atmospherics.PhoronBurnRateDelta; + mixture.GetMoles(Gas.Plasma) * Atmospherics.PlasmaOxygenFullburn) + plasmaBurnRate = (mixture.GetMoles(Gas.Plasma) * temperatureScale) / + Atmospherics.PlasmaBurnRateDelta; else - phoronBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PhoronOxygenFullburn)) / Atmospherics.PhoronBurnRateDelta; + plasmaBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PlasmaOxygenFullburn)) / Atmospherics.PlasmaBurnRateDelta; - if (phoronBurnRate > Atmospherics.MinimumHeatCapacity) + if (plasmaBurnRate > Atmospherics.MinimumHeatCapacity) { - phoronBurnRate = MathF.Min(MathF.Min(phoronBurnRate, mixture.GetMoles(Gas.Phoron)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate); - mixture.SetMoles(Gas.Phoron, mixture.GetMoles(Gas.Phoron) - phoronBurnRate); - mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (phoronBurnRate * oxygenBurnRate)); + plasmaBurnRate = MathF.Min(MathF.Min(plasmaBurnRate, mixture.GetMoles(Gas.Plasma)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate); + mixture.SetMoles(Gas.Plasma, mixture.GetMoles(Gas.Plasma) - plasmaBurnRate); + mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (plasmaBurnRate * oxygenBurnRate)); - mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, phoronBurnRate); + mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, plasmaBurnRate); - energyReleased += Atmospherics.FirePhoronEnergyReleased * (phoronBurnRate); + energyReleased += Atmospherics.FirePlasmaEnergyReleased * (plasmaBurnRate); - mixture.ReactionResults[GasReaction.Fire] += (phoronBurnRate) * (1 + oxygenBurnRate); + mixture.ReactionResults[GasReaction.Fire] += (plasmaBurnRate) * (1 + oxygenBurnRate); } } diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs index 7035c5194f..4b3d894894 100644 --- a/Content.Server/Atmos/TileAtmosphere.cs +++ b/Content.Server/Atmos/TileAtmosphere.cs @@ -150,14 +150,14 @@ namespace Content.Server.Atmos if (oxygen < 0.5f) return; - var phoron = Air.GetMoles(Gas.Phoron); + var plasma = Air.GetMoles(Gas.Plasma); var tritium = Air.GetMoles(Gas.Tritium); if (Hotspot.Valid) { if (soh) { - if (phoron > 0.5f || tritium > 0.5f) + if (plasma > 0.5f || tritium > 0.5f) { if (Hotspot.Temperature < exposedTemperature) Hotspot.Temperature = exposedTemperature; @@ -169,7 +169,7 @@ namespace Content.Server.Atmos return; } - if ((exposedTemperature > Atmospherics.PhoronMinimumBurnTemperature) && (phoron > 0.5f || tritium > 0.5f)) + if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f)) { Hotspot = new Hotspot { @@ -753,7 +753,7 @@ namespace Content.Server.Atmos ExcitedGroup?.ResetCooldowns(); if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f) - || Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Phoron] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f)) + || Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Plasma] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f)) { Hotspot = new Hotspot(); UpdateVisuals(); diff --git a/Content.Server/Construction/StackHelpers.cs b/Content.Server/Construction/StackHelpers.cs index 9521042b72..fcb72892cc 100644 --- a/Content.Server/Construction/StackHelpers.cs +++ b/Content.Server/Construction/StackHelpers.cs @@ -33,8 +33,8 @@ namespace Content.Server.Construction prototype = "MetalRodStack1"; break; - case StackType.Phoron: - prototype = "PhoronStack1"; + case StackType.Plasma: + prototype = "PlasmaStack1"; break; case StackType.Plasteel: diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs index 6ed0bcdeb1..9a8bcdb594 100644 --- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs @@ -225,7 +225,7 @@ namespace Content.Server.GameObjects.Components.Atmos case "chem.WeldingFuel": case "chem.Thermite": - case "chem.Phoron": + case "chem.Plasma": case "chem.Ethanol": AdjustFireStacks(volume.Float() / 10f); return volume; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs index 461647fd43..451a5c39d5 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs @@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping.Filters base.ExposeData(serializer); serializer.DataField(ref _volumeFilterRate, "startingVolumePumpRate", 0); serializer.DataField(ref _maxVolumeFilterRate, "maxVolumePumpRate", 100); - serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Phoron); + serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Plasma); serializer.DataField(ref _initialInletDirection, "inletDirection", PipeDirection.None); serializer.DataField(ref _initialFilterOutletDirection, "filterOutletDirection", PipeDirection.None); serializer.DataField(ref _initialOutletDirection, "outletDirection", PipeDirection.None); diff --git a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs index 8806e69272..0652e6bba7 100644 --- a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs @@ -104,8 +104,8 @@ namespace Content.Server.GameObjects.Components.Power void ISolutionChange.SolutionChanged(SolutionChangeEventArgs eventArgs) { IsRigged = Owner.TryGetComponent(out SolutionContainerComponent? solution) - && solution.Solution.ContainsReagent("chem.Phoron", out var phoron) - && phoron >= 5; + && solution.Solution.ContainsReagent("chem.Plasma", out var plasma) + && plasma >= 5; } } diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index d87ac132cd..15661334ad 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -168,16 +168,16 @@ namespace Content.Shared.Atmos public const float FireMinimumTemperatureToExist = T0C + 100f; public const float FireMinimumTemperatureToSpread = T0C + 150f; public const float FireSpreadRadiosityScale = 0.85f; - public const float FirePhoronEnergyReleased = 3000000f; + public const float FirePlasmaEnergyReleased = 3000000f; public const float FireGrowthRate = 40000f; public const float SuperSaturationThreshold = 96f; public const float OxygenBurnRateBase = 1.4f; - public const float PhoronMinimumBurnTemperature = (100f+T0C); - public const float PhoronUpperTemperature = (1370f+T0C); - public const float PhoronOxygenFullburn = 10f; - public const float PhoronBurnRateDelta = 9f; + public const float PlasmaMinimumBurnTemperature = (100f+T0C); + public const float PlasmaUpperTemperature = (1370f+T0C); + public const float PlasmaOxygenFullburn = 10f; + public const float PlasmaBurnRateDelta = 9f; /// /// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs) @@ -254,7 +254,7 @@ namespace Content.Shared.Atmos Oxygen = 0, Nitrogen = 1, CarbonDioxide = 2, - Phoron = 3, + Plasma = 3, Tritium = 4, WaterVapor = 5, } diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs index b1965ce364..4a9feb6fc6 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs @@ -11,6 +11,6 @@ namespace Content.Shared.GameObjects.Components.Power InsertingMetal, InsertingGlass, InsertingGold, - InsertingPhoron + InsertingPlasma } } diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index bcd14e0053..8f99d94742 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -128,7 +128,7 @@ namespace Content.Shared.GameObjects.Components MVCable, HVCable, Gold, - Phoron, + Plasma, Ointment, Gauze, Brutepack, diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index a337e11985..7355812aba 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -24,12 +24,12 @@ - type: gas id: 3 - name: Phoron + name: Plasma specificHeat: 200 heatCapacityRatio: 1.7 - molarMass: 120 #creadth: making it very heavy (x4 of oxygen), idk what the proper value should be + molarMass: 120 gasOverlaySprite: /Textures/Effects/atmospherics.rsi - gasOverlayState: phoron + gasOverlayState: plasma color: FF3300 - type: gas diff --git a/Resources/Prototypes/Atmospherics/reactions.yml b/Resources/Prototypes/Atmospherics/reactions.yml index 625b1fa2d3..765a75fff6 100644 --- a/Resources/Prototypes/Atmospherics/reactions.yml +++ b/Resources/Prototypes/Atmospherics/reactions.yml @@ -1,14 +1,14 @@ - type: gasReaction - id: PhoronFire + id: PlasmaFire priority: -2 minimumTemperature: 373.149 # Same as Atmospherics.FireMinimumTemperatureToExist minimumRequirements: # In this case, same as minimum mole count. - 0.01 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 0.01 # phoron + - 0.01 # plasma effects: - - !type:PhoronFireReaction {} + - !type:PlasmaFireReaction {} - type: gasReaction id: TritiumFire @@ -18,7 +18,7 @@ - 0.01 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 0 # phoron + - 0 # plasma - 0.01 # tritium effects: - !type:TritiumFireReaction {} diff --git a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml index 2d88feee39..7d7c3bcdf8 100644 --- a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml +++ b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml @@ -103,11 +103,11 @@ sprite: Objects/Tanks/generic.rsi - type: entity - id: PhoronTankFilled - parent: PhoronTank - name: phoron tank + id: PlasmaTankFilled + parent: PlasmaTank + name: plasma tank suffix: Filled - description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." + description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." components: - type: GasTank outputPressure: 101.325 @@ -117,5 +117,5 @@ - 0 - 0 - 0 - - 11.3146928 # phoron + - 11.3146928 # plasma temperature: 293.15 diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml index d4e8add604..fbb0c2e5c3 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml @@ -79,7 +79,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Phoron + - 0 # Plasma - 0 # Tritium - 0 # Water vapor temperature: 293.15 @@ -152,8 +152,8 @@ - type: entity parent: GasCanister - id: PhoronCanister - name: Phoron Canister + id: PlasmaCanister + name: Plasma Canister components: - type: Sprite sprite: Constructible/Atmos/canister.rsi @@ -165,7 +165,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 1871.71051 # phoron + - 1871.71051 # plasma temperature: 293.15 - type: entity @@ -183,7 +183,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Phoron + - 0 # Plasma - 1871.71051 # Tritium temperature: 293.15 @@ -202,7 +202,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Phoron + - 0 # Plasma - 0 # Tritium - 1871.71051 # Water vapor temperature: 293.15 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml index 3c00a38b73..774756c8d9 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml @@ -395,17 +395,17 @@ state_closed: scicratesecure_door - type: entity - id: CratePhoron - name: phoron crate + id: CratePlasma + name: plasma crate parent: CrateGeneric components: - type: AccessReader - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/phoron.rsi + sprite: Constructible/Storage/Crates/plasma.rsi layers: - - state: phoroncrate - - state: phoroncrate_door + - state: plasmacrate + - state: plasmacrate_door map: ["enum.StorageVisualLayers.Door"] - state: welded visible: false @@ -414,13 +414,13 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/phoron.rsi - state: phoroncrate_icon + sprite: Constructible/Storage/Crates/plasma.rsi + state: plasmacrate_icon - type: Appearance visuals: - type: StorageVisualizer - state_open: phoroncrate_open - state_closed: phoroncrate_door + state_open: plasmacrate_open + state_closed: plasmacrate_door - type: entity id: CrateSecure diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml index 311f160d43..87ef28bd9b 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml @@ -891,8 +891,8 @@ - type: entity parent: BaseSign - id: WarningPhoron - name: phoron waste sign + id: WarningPlasma + name: plasma waste sign description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working. components: - type: Physics @@ -907,7 +907,7 @@ - SmallImpassable - Clickable - type: Sprite - state: atmos_phoron + state: atmos_plasma - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index 571e5e7ea2..f762ebd521 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -89,15 +89,15 @@ node: reinforcedWindow - type: entity - id: PhoronWindow - name: phoronwindow + id: PlasmaWindow + name: plasma window parent: Window components: - type: Sprite drawdepth: WallTops - sprite: Constructible/Structures/Windows/phoron_window.rsi + sprite: Constructible/Structures/Windows/plasma_window.rsi - type: Icon - sprite: Constructible/Structures/Windows/phoron_window.rsi + sprite: Constructible/Structures/Windows/plasma_window.rsi - type: Damageable resistances: metallicResistances - type: Destructible @@ -110,7 +110,7 @@ soundCollection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - ShardGlassPhoron: + ShardGlassPlasma: min: 1 max: 2 - !type:DoActsBehavior @@ -120,4 +120,4 @@ base: pwindow - type: Construction graph: window - node: phoronWindow + node: plasmaWindow diff --git a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml index a1d7a55269..c4aa4a1465 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml @@ -157,37 +157,37 @@ count: 1 - type: entity - name: phoron ore - id: OrePhoron + name: plasma ore + id: OrePlasma parent: BaseItem components: - type: Sprite sprite: Objects/Materials/materials.rsi - state: phoron_ore + state: plasma_ore - type: entity - name: phoron sheet - id: PhoronStack + name: plasma sheet + id: PlasmaStack parent: MaterialStack suffix: Full components: - type: Material materials: - key: enum.MaterialKeys.Stack - mat: phoron + mat: plasma - type: Stack - stacktype: enum.StackType.Phoron + stacktype: enum.StackType.Plasma - type: Sprite sprite: Objects/Materials/sheets.rsi - state: phoron + state: plasma - type: Item sprite: Objects/Materials/sheets.rsi - HeldPrefix: phoron + HeldPrefix: plasma - type: entity - id: PhoronStack1 - name: phoron sheet - parent: PhoronStack + id: PlasmaStack1 + name: plasma sheet + parent: PlasmaStack suffix: 1 components: - type: Stack diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml index 2aea0da9b9..631b631bce 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml @@ -109,7 +109,7 @@ name: soap id: SoapNT parent: Soap - description: A Nanotrasen brand bar of soap. Smells of phoron. + description: A Nanotrasen brand bar of soap. Smells of plasma. components: - type: Sprite state: soapnt diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 6b219b7c63..d9969b5088 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -147,20 +147,20 @@ - Back - type: entity - id: PhoronTank + id: PlasmaTank parent: GasTankBase - name: phoron tank + name: plasma tank suffix: Empty - description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." + description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." components: - type: Sprite - sprite: Objects/Tanks/phoron.rsi + sprite: Objects/Tanks/plasma.rsi - type: GasTank outputPressure: 101.325 air: volume: 70 temperature: 293.15 - type: Clothing - sprite: Objects/Tanks/phoron.rsi + sprite: Objects/Tanks/plasma.rsi Slots: - Belt diff --git a/Resources/Prototypes/Entities/Objects/shards.yml b/Resources/Prototypes/Entities/Objects/shards.yml index c5d1d6a1f8..948774211a 100644 --- a/Resources/Prototypes/Entities/Objects/shards.yml +++ b/Resources/Prototypes/Entities/Objects/shards.yml @@ -54,9 +54,9 @@ amount: 10 - type: entity - id: ShardGlassPhoron - name: phoron glass shard - description: A small piece of phoron glass. It looks sharp, you wouldn't want to step on it barefoot. + id: ShardGlassPlasma + name: plasma glass shard + description: A small piece of plasma glass. It looks sharp, you wouldn't want to step on it barefoot. parent: ShardBase components: - type: Sprite @@ -66,6 +66,6 @@ - type: WelderRefinable refineResult: - GlassStack - - PhoronStack + - PlasmaStack - type: DamageOtherOnHit amount: 15 diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index 2a67394e45..b742d8ecfb 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -99,8 +99,8 @@ amount: 0.5 - type: reagent - id: chem.Phoron - name: phoron + id: chem.Plasma + name: plasma desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways. physicalDesc: gaseous color: "#7e009e" diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml index b39ba30366..b78a44f430 100644 --- a/Resources/Prototypes/Reagents/materials.yml +++ b/Resources/Prototypes/Reagents/materials.yml @@ -38,9 +38,9 @@ specificHeat: 1000 - type: material - id: phoron - name: phoron - icon: Objects/Materials/phoron_sheet.png + id: plasma + name: plasma + icon: Objects/Materials/sheets.rsi/plasma.png density: 200 electricResistivity: 2.1e-1 thermalConductivity: 80 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml index 069646137a..130fa28427 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml @@ -4,14 +4,14 @@ graph: - node: start edges: - - to: phoronWindow + - to: plasmaWindow steps: - material: Metal amount: 2 doAfter: 2 - material: Glass amount: 2 - - material: Phoron + - material: Plasma amount: 2 doAfter: 3 @@ -61,8 +61,8 @@ - tool: Anchoring doAfter: 2 - - node: phoronWindow - entity: PhoronWindow + - node: plasmaWindow + entity: PlasmaWindow edges: - to: start completed: @@ -73,7 +73,7 @@ prototype: MetalSheet1 amount: 2 - !type:SpawnPrototype - prototype: PhoronSheet1 + prototype: PlasmaSheet1 amount: 2 - !type:DeleteEntity {} steps: diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 720c48b34e..5a56555e30 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -107,18 +107,18 @@ canRotate: false - type: construction - name: phoron window - id: PhoronWindow + name: plasma window + id: PlasmaWindow graph: window startNode: start - targetNode: phoronWindow + targetNode: plasmaWindow category: Structures description: Clear and even tougher, with an orange tint. Must be built on top of a low wall. conditions: - !type:LowWallInTile {} - !type:NoWindowsInTile {} icon: - sprite: Constructible/Structures/Windows/phoron_window.rsi + sprite: Constructible/Structures/Windows/plasma_window.rsi state: full objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 6d50158ee7..286c7c5a8e 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -73,7 +73,7 @@ amount: 1 chem.Sodium: amount: 1 - chem.Phoron: + chem.Plasma: amount: 5 catalyst: true products: @@ -106,7 +106,7 @@ reactants: chem.Oxygen: amount: 2 - chem.Phoron: + chem.Plasma: amount: 5 catalyst: true products: @@ -211,7 +211,7 @@ amount: 1 chem.Copper: amount: 1 - chem.Phoron: + chem.Plasma: amount: 5 catalyst: true products: @@ -239,7 +239,7 @@ amount: 1 chem.Tramadol: amount: 1 - chem.Phoron: + chem.Plasma: amount: 1 products: chem.Oxycodone: 3 @@ -407,7 +407,7 @@ reactants: chem.Ammonia: amount: 1 - chem.Phoron: + chem.Plasma: amount: 1 products: chem.Lexorin: 2 diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_phoron.png b/Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_phoron.png rename to Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json b/Resources/Textures/Constructible/Misc/decals.rsi/meta.json index 353e0d413d..c05bf9d8a2 100644 --- a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json +++ b/Resources/Textures/Constructible/Misc/decals.rsi/meta.json @@ -88,7 +88,7 @@ ] }, { - "name": "atmos_phoron", + "name": "atmos_plasma", "delays": [ [ 1 diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..87f6def58f17b6e519523ec039a02b72ca097036 GIT binary patch literal 1789 zcmai#c{JPU8pnTWkczcMuWfFsRm-6E(z*mgEscyAN-?-vwY8$HN@$v7TBKE!+Ls6! zQM+1Nof>P2N-gPPxk9U!q_jkmA~C^a?jQ5lJ?EbDyzleA=e*DJecsPG&w1{9Bi$6B znos}$6g=Erd?Y^XuXRvHvM&^2Y$XnK!^h1TXd2UA0RWi}4;Lq2Y}pz)^opvh_E67Y z%s#VMhE}!F4=&N>Ri5zIbX>l-ayJC$*y18fQ}9($32|}H&^en~a!^xc$q5wgsr+Cf ze8xG?KtINvrLYFR-WPn(6jRz+Hv&Fjy(;p?aJLdKqqpNQoMg+7RmGiMbE1(C=(x*U z>)UISL@F9KTQ~vxh*=ueoN@5kN_RPywN)R{#S9L8Ff!L;ADgYUJApZ0q!S z8bn=Sik(G+kxh4^R#}_cH|2fv^t4YWGpx&K!I0-9IoOj#phsAs;~vulo-J>DIdX-} zH68~ur@gs1^ZiCK-vO@C7JJpzi`5=6Nw2{H?bsI9_o-}44za$Y!N0HJ8j?~*AKQ(( z($-15-g=h8#Vt|`sCyS7^4*3&rov`atiq>3SF}3IA#N_6o|fDY_>{p*y;p~{tO|kFWMu@133s>~no*+Z#~9if?f4+ABb827Uv8el_kI4X!8SkR zhMGzJqy=KOt0HeZ#MHVM)*+AX4E*Zax1*~Hwa>tc(^1dbjUhTINo6$>@+rzSt0`B( zf+1VG=s;+C>%g0Cs=y@oNj1$Ze$VQKU1x^R!}2=hJZUw*O7OVpPL`E*F#~698uW|SIlq_)qsV^5lhS`C)wbjqNgi|rLzJD(4hN#Y zzniCmAJ<<`ehR}i&xDDjQk?7UYXeXP>K7}kY1&HCNa3!jDt9zhT)Kp5!cB^P;t)rJ zkkl@4kv1fa^sJH=@f$B$k36uq216O$+Mj39Wk2`&(8J(D>oGh`RxGZ);fOIci`S0g z0%@d?=BpVA7XETt$H|E7Qu6>^hntGi?K7)Mm9AQ@K36Vnw@01drSiN$ z0Uhgy*iNAo4HrGK#4fGp?gt*r>7|{6qx{txRMc|NP~sk0+AC27VLrI%e+b%m%5w|9 zz{>=Jd+-XelL>k9|2EVPc@U3noM{3W$YAZO>u6pOEPJe$mJMpVOzo3rSZ-`P8Xabl7~ zk=5RFAvmgTQj9Brx&f79&@o=|Ywr>#C&n!l*gMOquU;(nu_JziV6!RcDbO80NtcBOjbR6fuqQPm`3x5CWH?btd)7^di2OQfA#~6KRIt6ol zhg%qrB>=#zJlN*(;;it~Mj%2oK>7ypRSew$+X`rKqGb=23#%w}5(GV@&=b&wDCn(y zpi904j*kMb@;y7m#;tuKFkg*@nEUFP-#fG|cMbB}qXMH#98~-cWd`(c7i6?=+Gf3f zeRw>yczgQC?w_@0`L}tH_m}>mDyc#|Sab3AdrQ1ShmYt*l|=7v;g3a4c9U*bEe}|% z=#~^VR-95MuC&_aBE!dxn$5pxYMj1{9xJypQFHm9lpUpcw5ox3goB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json index 6df05acbda..e67c993fe4 100644 --- a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json @@ -93,6 +93,22 @@ ] ] }, + { + "name": "autolathe_inserting_plasma_sheet", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "autolathe_inserting_gold_plate", "delays": [ diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/locked.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/locked.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json similarity index 87% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json index bb879f3e69..04b2a52d89 100644 --- a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json +++ b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json @@ -8,17 +8,17 @@ }, "states": [ { - "name": "phoroncrate", + "name": "plasmacrate", "select": [], "flags": {} }, { - "name": "phoroncrate_door", + "name": "plasmacrate_door", "select": [], "flags": {} }, { - "name": "phoroncrate_icon", + "name": "plasmacrate_icon", "select": [], "flags": {} }, @@ -46,7 +46,7 @@ "name": "sparking", "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]] }, { - "name": "phoroncrate_open", + "name": "plasmacrate_open", "select": [], "flags": {} } diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/off.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/off.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_door.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_door.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_icon.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_icon.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_open.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_open.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/sparking.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/sparking.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/unlocked.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/unlocked.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/welded.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/welded.png rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png deleted file mode 100644 index ead82446a8be2df72ff7cdbc2c0b661aa1612438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)=y?#JUkFb=!-{P>=8?-m0FcUQ+`vD_NzskmTqn9em~Gbz!sKAtX!W%-wio21V9 z^`otrXj=h*&QJw)q3L_M6nWp0;>3O`bJ)owK|U#gBo{3)O1}mDhca}>s>L699w>TJ z6qwC21z_=X!rBQY+s{dmIlLgnv7i}TlhHPA;pId56MMxKa>h=}k3fFDeK!mF9h(rW+! N002ovPDHLkV1mcn>>mIC diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png deleted file mode 100644 index a587292bd1c36ab6617517bb927f1fbb2b0fa828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP)*+uJKuZWo%`PRTmi<6_1(=x z%Og1#m_9mDZLF$PwTX8>NHMS#;M2>FZ1A-;HL6YR?7;O{1KjBDhsvh*({pW)NikeC zaj~ZH2d}~4WAQss|ENa=zrQ?de<-E;1RL_7FyYLk%%OZuo#s;zg3roLq_8V)<;pUTs zGjjr2fY$q+fya*z_o!VL1+oCUOJ`SQcnq`P*Tgv2xU*PY3A!*BSQB7vGO4nFJJz2C zxMu-bfYOSp(AI@4APa!AJq8=pYB*g z5ClOGg#Qup5;Zw+Pg!Fdo}n4!=MR0DXS)<8Us!5xS_y!T?VqXlSzi!5OB*~9p1uCY zQUtm&vOKFcw8*e<0X=-bDGFXzpyyBhEgKkn9M&S_8zq`B&;PP9{yxApYmDW6`8Ls( zX|Ait?(13utPg5VjOJ8`+G5)REDCoe)63dasVRLu)+$>~~V% zP6(h!-v;d00k(Zb_5#=(eT20D#c-8b3*aC9Fc+E%TLJu|A69>0LIkz~=+Qr~{=ft* z1<5?!Q``P<A`?m1PdxjmH&%8d@O`6caYI2T$ za#S^cghTg@gS8CYKeEhyMTEp74#fWL6uZa1p<(Ay)equ&dqsuWBM!Llb>n>3eZ`*L zqoI)}B!O|}8;KI%Jq>x!H;4P&(UyM8z%04qzn{1O$)4%(_lhl7mLIR z2UjMZlm$u{%Gz%Huqg7jxA_~t>ulTp&BxB|%+F0pU`v1g#s?T<44$rjF6*2UngH4` B#RC8U diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png deleted file mode 100644 index a587292bd1c36ab6617517bb927f1fbb2b0fa828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP)*+uJKuZWo%`PRTmi<6_1(=x z%Og1#m_9mDZLF$PwTX8>NHMS#;M2>FZ1A-;HL6YR?7;O{1KjBDhsvh*({pW)NikeC zaj~ZH2d}~4WAQss|ENa=zrQ?de<-E;1RL_7FyYLk%%OZuo#s;zg3roLq_8V)<;pUTs zGjjr2fY$q+fya*z_o!VL1+oCUOJ`SQcnq`P*Tgv2xU*PY3A!*BSQB7vGO4nFJJz2C zxMu-bfYOSp(AI@4APa!AJq8=pYB*g z5ClOGg#Qup5;Zw+Pg!Fdo}n4!=MR0DXS)<8Us!5xS_y!T?VqXlSzi!5OB*~9p1uCY zQUtm&vOKFcw8*e<0X=-bDGFXzpyyBhEgKkn9M&S_8zq`B&;PP9{yxApYmDW6`8Ls( zX|Ait?(13utPg5VjOJ8`+G5)REDCoe)63dasVRLu)+$>~~V% zP6(h!-v;d00k(Zb_5#=(eT20D#c-8b3*aC9Fc+E%TLJu|A69>0LIkz~=+Qr~{=ft* z1<5?!Q``P<A`?m1PdxjmH&%8d@O`6caYI2T$ za#S^cghTg@gS8CYKeEhyMTEp74#fWL6uZa1p<(Ay)equ&dqsuWBM!Llb>n>3eZ`*L zqoI)}B!O|}8;KI%Jq>x!H;4P&(UyM8z%04qzn{1O$)4%(_lhl7mLIR z2UjMZlm$u{%Gz%Huqg7jxA_~t>ulTp&BxB|%+F0pU`v1g#s?T<44$rjF6*2UngH4` B#RC8U diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png deleted file mode 100644 index a6938da9d202d165b0ed91bd19f114f5c08cda42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVBF;C;uumf=k2WhUWWrj+WT+a zu+LJ~hWHGefgJ)(rfQ`B+1=# zy0!A^(b8SV_A_cZIIwAuK{VWUC~q}8n=hhIHrWnt`Pk>Bv^hyQ{10jKNRuC{X*ywT}B zzpFNUS`^106PZs4f>~5XH sJfD3J`~47!qkp+Ix)yFVdQ&MBb@0CbJcoB#j- diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png deleted file mode 100644 index ef4325d6bf286ac48ef809c1839e22f9f191f788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 892 zcmV-?1B3jDP)QSn-7%fkInAPci+ywdGl=_2s3x{M7^;G zhew01ofU?@vrgaDFg&jG71rkf_QZqR*(b@6=!uuXzPhbFmBO$v(uIQaF2 zCvv0e0&)S=;8z!)LFC{BXWvO66~H<8=)@_=F1>|Nbidr_I)LR7uqY=!lz-GX zPfr4SCTMyTunXXfg23)!*H#iw)&eRDsv9MH(9YHu0yNGAjgcUUwg6bnP+!%;I&5Y$ zuE&`=7ii}J&T;kA8Bm$^(SZ#9$`um_ z0P#o=LgTH|=g`s9kbe2_{}mvU+k`l@4rvqsy$1E#7R&XG&I52K33rsh;W?nj_(X`? zV_>WR&b!ZvxB#QpuW86_$Jh&piMRmYD_c#T0k7^pVq63$yz&=`zXluG>F%TV06hql zg%oiC@DUgq{BteP>h9yB30IDk|6(I9z_sb*c0nU~|9Txg1cL+K)oF}+4Wf4dJp||_ z@CxJd05=bTo7aE}-hWHGefgJ)(rfQ`B+1=# zy0!A^(b8SV_A_cZIIwAuK{VWUC~q}8n=hhIHrWnt`Pk>Bv^hyQ{10jKNRuC{X*ywT}B zzpFNUS`^106PZs4f>~5XH sJfD3J`~47!qkp+Ix)yFVdQ&MBb@0CbJcoB#j- diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png deleted file mode 100644 index 4e754d7d97e24cf023807345cdac36577981faa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 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 RorV?}MzON9EHd92{ZDvFfe-)y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json rename to Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4eb741d6cb99e20f90ad3984677fad845d329d GIT binary patch literal 522 zcmV+l0`>igP)><@*McOY7b7J;(} zC*)#OvODW6&Q}F4x6Azd?RX9xo=JiK;h9 zxV^gj@_W<#fuqY)bvehI1AJRE6wXPo&c-nY4;}<4vXXp~1G5Yr8_rvx4!-^zn+R%u z1w!FnfY@AM4v-i$CKs3kqy~<~1?B+B!DDcNIY4>>?JfxB0F9+E1QKBTq^~k~!!QiP zFbv~A{4fb|p@hG7_nVHnbU0Nvb-$3q4q7XSbN M07*qoM6N<$g3)B#G5`Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png new file mode 100644 index 0000000000000000000000000000000000000000..270bb8a168d9aebae3d7e4cbcdf8bb904e0af23a GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vsQaSW-L^LCak*C7WHws247 zYo3}KFI#0CH+&EfYx*wmUNNGAgZrQ|%bVt=)S&L(1yjYczKf}S*r&}_N_$`|t*AzMN*oOlK>QmhMDGe81` z@(vt|Edovzs;`!BT;t&!YgQjW)qYj+jJMN%JpYk@$DUh*LD%82ox|(4AP&Vh&u6Dk y>aXj2-u%Zn<9@_{{eu12jm5ABMc@v51!IS}#@d5lc9jEzjKR~@&t;ucLK6U8?S;?) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4eb741d6cb99e20f90ad3984677fad845d329d GIT binary patch literal 522 zcmV+l0`>igP)><@*McOY7b7J;(} zC*)#OvODW6&Q}F4x6Azd?RX9xo=JiK;h9 zxV^gj@_W<#fuqY)bvehI1AJRE6wXPo&c-nY4;}<4vXXp~1G5Yr8_rvx4!-^zn+R%u z1w!FnfY@AM4v-i$CKs3kqy~<~1?B+B!DDcNIY4>>?JfxB0F9+E1QKBTq^~k~!!QiP zFbv~A{4fb|p@hG7_nVHnbU0Nvb-$3q4q7XSbN M07*qoM6N<$g3)B#G5`Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png new file mode 100644 index 0000000000000000000000000000000000000000..270bb8a168d9aebae3d7e4cbcdf8bb904e0af23a GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vsQaSW-L^LCak*C7WHws247 zYo3}KFI#0CH+&EfYx*wmUNNGAgZrQ|%bVt=)S&L(1yjYczKf}S*r&}_N_$`|t*AzMN*oOlK>QmhMDGe81` z@(vt|Edovzs;`!BT;t&!YgQjW)qYj+jJMN%JpYk@$DUh*LD%82ox|(4AP&Vh&u6Dk y>aXj2-u%Zn<9@_{{eu12jm5ABMc@v51!IS}#@d5lc9jEzjKR~@&t;ucLK6U8?S;?) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png new file mode 100644 index 0000000000000000000000000000000000000000..92a2e25099e85e5ba71171e8fb6d4d512e4ab730 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{vvRaSW-L^LCaY*C7WHR`W@2 zYmy}cE^%8nB|KErVR^53&w0ZK0kI}`fj7-fORps;gaXUeI)J@r?`FUGj{PGaqzyV<;t4{QoM`{|SY0){ONz26yqn2%UKFWX!j7bDKB zbvu3PbG@6_zCKs}T=o9gZ+!>G3`Qx|1*{n&4Ppxd8KN582nrng&G2mPs;4Pa?dx9| z?kyC*t7oiVcWaI>qtsk0DTOWn9DZ&&rvKWk z@9@9-0pq*5>c3R(ooB#m^B#VM76B&?#hRyFORP24uDZK10T^ryp00i_>zopr04PR< Awg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png new file mode 100644 index 0000000000000000000000000000000000000000..c4dd3aeeb5f4c1f62d57cfb1e1bd3b3804241431 GIT binary patch literal 512 zcmV+b0{{JqP)15QU$DnvmKq1qs^++{IrcIU$26hT1* z7ZRF3vGYnJ?d*K}Jd$=NgR(wfzs_y14Mo6sGQxIU{rz_PTx5OX=Y4Lb&~)+8>H22! z6jBF3olsX@sYW-TBsPFTm{OQT5$`{A{r6iO|jcwJHE|2Mpyzs8;edAb9}lA1B)V1<5-=y-BL=Q-iCx zssm`77+24MI)E;H1RM|sQ3FB|5X*?|x*~7A83X`MnFmm>K9|e`;Ff6s+^Y{52OuG{ z03=o)FbqISCILvTK427pq|5=3Tz$YG0BNaz3^jL!Kc3#s(k<4e957!kvs2vQSnb7P zngRg)LdXw0v3TYHNXr3ePe5A^Kzjn(asb*B(AEzKq<}qa_|*vj0000;gaXUeI)J@r?`FUGj{PGaqzyV<;t4{QoM`{|SY0){ONz26yqn2%UKFWX!j7bDKB zbvu3PbG@6_zCKs}T=o9gZ+!>G3`Qx|1*{n&4Ppxd8KN582nrng&G2mPs;4Pa?dx9| z?kyC*t7oiVcWaI>qtsk0DTOWn9DZ&&rvKWk z@9@9-0pq*5>c3R(ooB#m^B#VM76B&?#hRyFORP24uDZK10T^ryp00i_>zopr04PR< Awg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png new file mode 100644 index 0000000000000000000000000000000000000000..a0cee7e71ef540626f3fd30f9de3b3d03f48671d GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yFFbTLn`LHy>*b&$&rWQVhy*T z&e>Bsz8eH}mD<_gov}6GQJj7^+u;56=euXt+q}P?_HUcyKX$GKtR~0VBV;E?)*sm> zv!9Xm0@Ey}3`SqZEe*>Uq8x%5bQfqgh+PnI;LZRk#UuUV_Me{r@dba_h)|1U)Y*@W Zb@$nL>Q4T6vJdDD22WQ%mvv4FO#t_1QilKl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/atmospherics.rsi/meta.json b/Resources/Textures/Effects/atmospherics.rsi/meta.json index 9a88a3dfef..097df896da 100644 --- a/Resources/Textures/Effects/atmospherics.rsi/meta.json +++ b/Resources/Textures/Effects/atmospherics.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "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]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "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]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "phoron", "delays": [[0.1, 0.1, 0.1]]}, {"name": "phoron_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]} +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "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]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "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]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "plasma", "delays": [[0.1, 0.1, 0.1]]}, {"name": "plasma_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]} diff --git a/Resources/Textures/Effects/atmospherics.rsi/phoron.png b/Resources/Textures/Effects/atmospherics.rsi/phoron.png deleted file mode 100644 index bf43a48196f967a98964837c327cc065c0bd8283..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1909 zcmV-*2a5QKP)C*j4(Gwv`BF72OZ?%JS8 z%wRDQFkyVy5Tv7qzmcgGbc&NG;y%G@z0sO`ob>Ver8o{ON{A>CJCU5n=a)HlX9#o+ z$kYmUEbd(3UI|5G^YQkoH761hnDi8+C+C^W2u^{g4LYRRS`82GkI=|aip#P zczeY~YjK5OqEa;f;!qnH$f{URY{2obueme3vxn`@@7`*?X)`u}ku`+COw?O%1kuf* zd$gq0unkQZyMZ|dW@Us6{|Xwhe|p@3&RY1g~X$AZvydtV;6;Ul{CX;Q(1_FYaZX^9V-(IMf3;d)GB*&+W5<4q-D%0bOw>y)iWYEI zzF>shgPX?vb6sQX2bru3M1Mjqpn4fJg4%?O{j))!RxgN>q#R--3oaCC_SXF5_E8oT6Ohb#frs`U#JeE^y!ev7vkIculDtG4&xK9En4qhOgIWPHA`H|k z21rdnXlEOm%Su*o@x8K^cY1E9?PeI3w=lYQ4$DAl|}L zIUM_9fwW=9!|9O6(yB1}^7k3XSQ7;Q%>=TqMgmUF6A)ZwigT?pU(goRg|v4m@o_vp z_y6;s{l5!|xhSk;h$ANt5W5NSMsn0B{m;EXaZ#uYAYx(_Wh^!t<*md%gqj{_UVaR) z6LYh_>oY(xcEw6DLF*?fz+>JN!hj@#T5ztfMvsAk+1UPGAPm6W7^u7zKU3Y_6%Hve zEuCXCZUSLIw(ud4x_x+zjIiv2LU^2K%>K?ehrAd(1F(pxz!Kk6bU2C4PrL|mQFsO@ z{joZ9S?x@1LJwmZJi=#*2Un?WmyIgLn2mvdoq%f|0`*mp`yP&y^L8Y-uszH-*ap1^{3 z9|(W7F=veHGeG&xA74Zo;8-lVAvyzmL5UAHZwfSmCEdo`91cXdHjd0SCY5e@T^&{+ zl)Kx<1PsQJIrp^+D|g9&&WHg#lxwakAXGN*?cN&Jb@?{8K&60MDu%?d7Mwa=1+gAL v+1Z%57LWt>-Dxjo(~?a(iqm9EK~pn09ZIg zGSus>Zt9Kq*2F4{-tx3E#{uwLVBVd}7hsStQ2@)+O1}2Sz|HY|0B+LP{Q;oW@2$ZY z*UiORsR}nC%3mMaSco4MJ(@d!xFDkfTu7(u=E8&M$;mUXFcX*dk12x|Fd)~M0gey} znc%~MFdr3tMxidKQyj!l_YBv~#cJ+(&~~>Ur9+bvCdQb}G^gF|r}&*A@HNoiT?6P- zq&J39XVbmESS9X-`~zWny~uym9n9%Osf=etC2ksMp)6f&!*{=ecyJj3Ery z)Yc&g$JzxZVdf;qn2#%WJRcg|wWLzt1yPI0%sl2r-NmsU!@CYZ_lN+rTAAA%wYM1G zTG{T!kFum?1y>2dIr&CaLgd|M1+X_I# z+Z=C?p0+x^p$W9*695J+fR&EMta`P(eCzWcl(lq&CI}y130W?b#&40_UtSthrTiqq(RTv?M#HWUUeZHH6i364E@0eYH~rp5geVUN`WU8!C- zmturQn!@eYb|}s_3&1o2gA#jqumq{iA%@eI0H!)3iO}@E48T|Y;HmZGqMxbPTbDU9 zEpulH@419#2_uH*Kq`QQC_6HzkKS&^oKgz_-TPZ>#Ra0i$Ma#VB-Y^`3usj8(~2fz zA_m+AkV(`DQl>_V)(UmT``9lOWv$`|fW)Lq&Q*k08*M^2S-1r~Sj<`WI3=(t35v&( zPpj6Kj7Ou3)RWBLGEKrC?+6<^8x_2Zz1(=fP{et zK&9+mn;`F6l9yQYfZHN)Owh3jFtJkl+8YkYOhDAiatLR97PGtp0_1vhw*-oW| zo@kfWfFcToNdUR3((#l`uryX&$?N7)ia}~1D~EGmE|79Tgy$HAI=3p!72PAs5t)fl z1=bAe%uO&itMs7bf;iT%g&$ZG>O$H(m-$FfpZovu&+mWFp!4PMk|Ac!I)%xYcakId zE%*QI1&S|)DFDSxtfF-9Z;eylO8i5p>FLa?0unzlHT(Nkm;x}I-Dss)!RjX_plLo8 zB7h`)a}D#6ols& zkTV{~xo$4iC(a?i3=6=`{RN)-K4Qa3Z2sUyh%dzgFw0wvp$=+05qE)t8tXGS zAZSIq+m{^XXAVey3|=Itp-p4}fbRXRWCpPgzdWt_>*n%O0g%8eiE)L-D>0YMBH1a( zkwxm*9Hk|Iwq9?!JkFPmEey-ks-yl|-7}`^^>#`y^&^mMP@Y==9j&Z&rj{|J{@Y|& zo>sc1m^j360^H&SouFQ2E210yzo6^pqHlIvXLB!+8%R1lnz@CnZ_4GQgjT)Y>I;oP zeoFK-SS2yQV3N}1QkcxQu_^#Ko)2;!r%P#1SAQS~z=#HQ)~0s?57vDk{;!QGG=3Bd zAQn9IEl}fESTk3300000NkvXXu0mjfC$zXX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/atmospherics.rsi/phoron_old.png b/Resources/Textures/Effects/atmospherics.rsi/plasma_old.png similarity index 100% rename from Resources/Textures/Effects/atmospherics.rsi/phoron_old.png rename to Resources/Textures/Effects/atmospherics.rsi/plasma_old.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index a6277d2a5c..b4f8812367 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -58,6 +58,9 @@ { "name": "tinbar_single" }, + { + "name": "plasma_ore" + }, { "name": "phoron_ore" }, diff --git a/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png b/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..71d824eedbbe441521a966a64544ada1d2d77cb5 GIT binary patch literal 501 zcmVMG%_7LFp!$Tm%Od zoTPZrN=tA$aOhBn^RBU_F>w;fH-$9$y_YY!Dfs6>ApxZkMZ+7+mGgEv#l>Og>t2Pgr{ zvXD~toE<6V1x@;lopEc&Yn(EkUWQj!|v= zssX^jb+s4GGQ5?|@1|x@;GhT~r3{6K3h3HhyJCjBwud8fMo8D(B_!Gs5WWn13Ji~o znfI=j7WF{Qw3poN#<>#u`X*f4Ghcof93t!k*=+XP=A(r=6FeUk9!Vf5k{+EfyIyBH r*LxIrECGP9Kbxq)BuSDa`E&UM-W%XkWL`3e00000NkvXXu0mjfoDt(# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json index 7dd54c1780..56884b6d2c 100644 --- a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json @@ -35,6 +35,12 @@ { "name": "phoron" }, + { + "name": "plasmaglass" + }, + { + "name": "plasma" + }, { "name": "metal" }, diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png b/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..fc2764fe538e7f04010d903261c5dc2ab1b82039 GIT binary patch literal 420 zcmV;V0bBlwP)1m=8m?hOHqjEsy9tjX91KAzo@cz*tV?L2=p0NGep7sSaJ z=5H5E0)Wu+p;jH3&|V3Uol{n>tKMY}i&MDF0U`!nF9389 zg8*p0A$aG!Nxyg%eNZ%RFH4t1uN@#eC$e+O;*=W)1u!d-#VLOdit5%bb859qtqF+b z5(ldD1^_Itc>PVlO*{bgaZK+Y01Oy`*j%yAI`gbt??58<=Qsv0q5Ro|mXF1Dh0yYA zrWHiQfLYmqkzsE>gVvN!buWau(DdVFmq_CA`NybW)aWPg*S!|Jbp)!OF7Fzf?j~L> z`o6}k04juh^GZteLybEDbP%%kG42JRLdY;(%QYH+3eo2mYh+|}RQds%v8|f6V9O=| O0000IS&y|0D>f;}c$wUv!e_Byco59z7gB#^%o6VTEWD zP(cLTn`iSx1o-h`ik8CX@oA?Lx-JOd7&bHZpEb!<2m__uRf>U9+*U#*=q=6U_6{p- zW<=_)>6?vP19Jyygi=Y#N+DEDHUoDjP8?AsPAw~8S)QxWsX(MoI;$W7ib@HUqNT94 zA1Lnx_MTQ015F-K$x7Ua0$Z}3`>px36eI}oJgso@Wrh@_7RU-LkG%?=3Z%?SUe%?R z!-zHb?DrJ3%ekmJ8@$8wqU;;G0<(0LXZOL zsiCF7AThAHQ|tzIwCW_#sX&kbtggHdqyXu$!<`BQ34chOVGF~x&wuT&K_^8;v&mK_ zznr{*FU7nEi%tUDvXjl$Ch+Lk+*ip&$9_3JcPu(szk{fA3sf#$I+hM4pQmIw){wHf z=YH#-YY`9>-C77$PYgsT21>k068p?kr8Y`<4K}lzDZ{e4^Q92HcH+4s>da=2ma9JS z*mSI0`W8LPus}=U=f`QP`*wsmHcv_0hB=t?{r#jjfnI0k+k5Xu2lo#a#v|Q;%O1!R zHq~bBoNrB$_?`X0000< KMNUMnLSTY?qBL#* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png rename to Resources/Textures/Objects/Tanks/plasma.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/icon.png b/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Tanks/phoron.rsi/icon.png rename to Resources/Textures/Objects/Tanks/plasma.rsi/icon.png diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/plasma.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Tanks/phoron.rsi/inhand-left.png rename to Resources/Textures/Objects/Tanks/plasma.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/plasma.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Tanks/phoron.rsi/inhand-right.png rename to Resources/Textures/Objects/Tanks/plasma.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Tanks/phoron.rsi/meta.json rename to Resources/Textures/Objects/Tanks/plasma.rsi/meta.json