diff --git a/Content.Client/Audio/AudioUIController.cs b/Content.Client/Audio/AudioUIController.cs index ef903672fd..16e1edd252 100644 --- a/Content.Client/Audio/AudioUIController.cs +++ b/Content.Client/Audio/AudioUIController.cs @@ -54,7 +54,7 @@ public sealed class AudioUIController : UIController { if (!string.IsNullOrEmpty(value)) { - var resource = _cache.GetResource(value); + var resource = GetSoundOrFallback(value, CCVars.UIClickSound.DefaultValue); var source = _audioManager.CreateAudioSource(resource); @@ -77,7 +77,7 @@ public sealed class AudioUIController : UIController { if (!string.IsNullOrEmpty(value)) { - var hoverResource = _cache.GetResource(value); + var hoverResource = GetSoundOrFallback(value, CCVars.UIHoverSound.DefaultValue); var hoverSource = _audioManager.CreateAudioSource(hoverResource); @@ -95,4 +95,12 @@ public sealed class AudioUIController : UIController UIManager.SetHoverSound(null); } } + + private AudioResource GetSoundOrFallback(string path, string fallback) + { + if (!_cache.TryGetResource(path, out AudioResource? resource)) + return _cache.GetResource(fallback); + + return resource; + } } diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs index da008ca04c..c14a8c5bd0 100644 --- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Research; using Content.Shared.Research.Components; -using Robust.Client.GameObjects; namespace Content.Client.Research.UI { diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index 07dd35a005..a0a2b58e88 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -1,5 +1,4 @@ using Content.Shared.Research.Components; -using Robust.Client.GameObjects; namespace Content.Client.Research.UI { diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index f29e66baae..2a9782045b 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Research.Components; using JetBrains.Annotations; -using Robust.Client.GameObjects; namespace Content.Client.Research.UI; diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index b364b83312..77ebe6740c 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -81,7 +81,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state) { var amountMsg = new FormattedMessage(); - amountMsg.AddMarkup(Loc.GetString("research-console-menu-research-points-text", + amountMsg.AddMarkupOrThrow(Loc.GetString("research-console-menu-research-points-text", ("points", state.Points))); ResearchAmountLabel.SetMessage(amountMsg); @@ -98,7 +98,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow } var msg = new FormattedMessage(); - msg.AddMarkup(Loc.GetString("research-console-menu-main-discipline", + msg.AddMarkupOrThrow(Loc.GetString("research-console-menu-main-discipline", ("name", disciplineText), ("color", disciplineColor))); MainDisciplineLabel.SetMessage(msg); diff --git a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs index f547457203..292ed0ebe0 100644 --- a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs +++ b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs @@ -23,7 +23,7 @@ public sealed partial class TechnologyCardControl : Control DisciplineTexture.Texture = spriteSys.Frame0(discipline.Icon); TechnologyNameLabel.Text = Loc.GetString(technology.Name); var message = new FormattedMessage(); - message.AddMarkup(Loc.GetString("research-console-tier-discipline-info", + message.AddMarkupOrThrow(Loc.GetString("research-console-tier-discipline-info", ("tier", technology.Tier), ("color", discipline.Color), ("discipline", Loc.GetString(discipline.Name)))); TierLabel.SetMessage(message); UnlocksLabel.SetMessage(description); diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs index 88edb6a4f1..1e4d2f2765 100644 --- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs +++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs @@ -1,11 +1,13 @@ using System.Linq; using Content.Client.CharacterInfo; using Content.Client.Gameplay; +using Content.Client.Stylesheets; using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Systems.Character.Controls; using Content.Client.UserInterface.Systems.Character.Windows; using Content.Client.UserInterface.Systems.Objectives.Controls; using Content.Shared.Input; +using Content.Shared.Objectives.Systems; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Player; @@ -121,11 +123,17 @@ public sealed class CharacterUIController : UIController, IOnStateEntered(anomaly, out var anomalyComp)) { - msg.AddMarkup(Loc.GetString("anomaly-scanner-no-anomaly")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-no-anomaly")); return msg; } @@ -149,14 +149,14 @@ public sealed partial class AnomalySystem //Severity if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P")))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P")))); msg.PushNewline(); //Stability if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-stability-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-stability-unknown")); else { string stateLoc; @@ -166,54 +166,54 @@ public sealed partial class AnomalySystem stateLoc = Loc.GetString("anomaly-scanner-stability-high"); else stateLoc = Loc.GetString("anomaly-scanner-stability-medium"); - msg.AddMarkup(stateLoc); + msg.AddMarkupOrThrow(stateLoc); } msg.PushNewline(); //Point output if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp)))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp)))); msg.PushNewline(); msg.PushNewline(); //Particles title - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-readout")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-readout")); msg.PushNewline(); //Danger if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType)))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType)))); msg.PushNewline(); //Unstable if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType)))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType)))); msg.PushNewline(); //Containment if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType)))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType)))); msg.PushNewline(); //Transformation if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation)) - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation-unknown")); else - msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType)))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType)))); //Behavior msg.PushNewline(); msg.PushNewline(); - msg.AddMarkup(Loc.GetString("anomaly-behavior-title")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-title")); msg.PushNewline(); if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior)) @@ -224,14 +224,14 @@ public sealed partial class AnomalySystem { var behavior = _prototype.Index(anomalyComp.CurrentBehavior.Value); - msg.AddMarkup("- " + Loc.GetString(behavior.Description)); + msg.AddMarkupOrThrow("- " + Loc.GetString(behavior.Description)); msg.PushNewline(); var mod = Math.Floor((behavior.EarnPointModifier) * 100); - msg.AddMarkup("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod))); + msg.AddMarkupOrThrow("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod))); } else { - msg.AddMarkup(Loc.GetString("anomaly-behavior-balanced")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-balanced")); } } diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs index f475ec3cfc..ffa1b7ef4e 100644 --- a/Content.Server/Botany/Components/SeedComponent.cs +++ b/Content.Server/Botany/Components/SeedComponent.cs @@ -24,7 +24,7 @@ namespace Content.Server.Botany.Components /// /// Name of a base seed prototype that is used if is null. /// - [DataField("seedId", customTypeSerializer:typeof(PrototypeIdSerializer))] + [DataField("seedId", customTypeSerializer: typeof(PrototypeIdSerializer))] public string? SeedId; } } diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs index c7ce5d47ef..474859823a 100644 --- a/Content.Server/Botany/Systems/MutationSystem.cs +++ b/Content.Server/Botany/Systems/MutationSystem.cs @@ -2,10 +2,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Content.Shared.Random; using Content.Shared.Random.Helpers; -using Content.Shared.Chemistry.Reagent; using System.Linq; using Content.Shared.Atmos; -using FastAccessors; namespace Content.Server.Botany; @@ -42,6 +40,7 @@ public sealed class MutationSystem : EntitySystem // Add up everything in the bits column and put the number here. const int totalbits = 275; + #pragma warning disable IDE0055 // disable formatting warnings because this looks more readable // Tolerances (55) MutateFloat(ref seed.NutrientConsumption , 0.05f, 1.2f, 5, totalbits, severity); MutateFloat(ref seed.WaterConsumption , 3f , 9f , 5, totalbits, severity); @@ -75,6 +74,7 @@ public sealed class MutationSystem : EntitySystem MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity); MutateBool(ref seed.CanScream , true , 10, totalbits, severity); seed.BioluminescentColor = RandomColor(seed.BioluminescentColor, 10, totalbits, severity); + #pragma warning restore IDE0055 // ConstantUpgade (10) MutateHarvestType(ref seed.HarvestRepeat, 10, totalbits, severity); @@ -261,7 +261,7 @@ public sealed class MutationSystem : EntitySystem { var pick = _randomChems.Pick(_robustRandom); string chemicalId = pick.reagent; - int amount = _robustRandom.Next(1, ((int)pick.quantity)); + int amount = _robustRandom.Next(1, (int)pick.quantity); SeedChemQuantity seedChemQuantity = new SeedChemQuantity(); if (chemicals.ContainsKey(chemicalId)) { @@ -274,7 +274,7 @@ public sealed class MutationSystem : EntitySystem seedChemQuantity.Max = 1 + amount; seedChemQuantity.Inherent = false; } - int potencyDivisor = (int) Math.Ceiling(100.0f / seedChemQuantity.Max); + int potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max); seedChemQuantity.PotencyDivisor = potencyDivisor; chemicals[chemicalId] = seedChemQuantity; } diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs index f1ae6c9f11..9a5e70762e 100644 --- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs +++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs @@ -29,12 +29,12 @@ public sealed class SeedExtractorSystem : EntitySystem return; if (!_botanySystem.TryGetSeed(produce, out var seed) || seed.Seedless) { - _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds",("name", args.Used)), + _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds", ("name", args.Used)), args.User, PopupType.MediumCaution); return; } - _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-interact-message",("name", args.Used)), + _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-interact-message", ("name", args.Used)), args.User, PopupType.Medium); QueueDel(args.Used); diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs index df8718a022..3099b2f90f 100644 --- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs @@ -36,14 +36,14 @@ public sealed class CharacterInfoSystem : EntitySystem if (_minds.TryGetMind(entity, out var mindId, out var mind)) { // Get objectives - foreach (var objective in mind.AllObjectives) + foreach (var objective in mind.Objectives) { var info = _objectives.GetInfo(objective, mindId, mind); if (info == null) continue; // group objectives by their issuer - var issuer = Comp(objective).Issuer; + var issuer = Comp(objective).LocIssuer; if (!objectives.ContainsKey(issuer)) objectives[issuer] = new List(); objectives[issuer].Add(info.Value); diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index 96ca8d3614..e626edeb26 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -225,7 +225,7 @@ public sealed partial class DragonSystem : EntitySystem return; var mind = Comp(mindContainer.Mind.Value); - foreach (var objId in mind.AllObjectives) + foreach (var objId in mind.Objectives) { if (_objQuery.TryGetComponent(objId, out var obj)) { @@ -247,7 +247,7 @@ public sealed partial class DragonSystem : EntitySystem return; var mind = Comp(mindContainer.Mind.Value); - foreach (var objId in mind.AllObjectives) + foreach (var objId in mind.Objectives) { if (_objQuery.TryGetComponent(objId, out var obj)) { diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs index 5c117bc20a..0268a971e2 100644 --- a/Content.Server/GameTicking/GameTicker.GameRule.cs +++ b/Content.Server/GameTicking/GameTicker.GameRule.cs @@ -329,6 +329,13 @@ public sealed partial class GameTicker foreach (var rule in args) { + if (!_prototypeManager.HasIndex(rule)) + { + shell.WriteError($"Invalid game rule {rule} was skipped."); + + continue; + } + if (shell.Player != null) { _adminLogger.Add(LogType.EventStarted, $"{shell.Player} tried to add game rule [{rule}] via command"); diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs index ee542572d7..4603f45ed8 100644 --- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs +++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs @@ -95,7 +95,7 @@ public sealed class RandomGiftSystem : EntitySystem foreach (var proto in _prototype.EnumeratePrototypes()) { - if (proto.Abstract || proto.NoSpawn || proto.Components.ContainsKey(mapGridCompName) || !proto.Components.ContainsKey(physicsCompName)) + if (proto.Abstract || proto.HideSpawnMenu || proto.Components.ContainsKey(mapGridCompName) || !proto.Components.ContainsKey(physicsCompName)) continue; _possibleGiftsUnsafe.Add(proto.ID); diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs index 97fc943269..88dcdcedf6 100644 --- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs +++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs @@ -33,7 +33,7 @@ namespace Content.Server.Objectives.Commands } shell.WriteLine($"Objectives for player {player.UserId}:"); - var objectives = mind.AllObjectives.ToList(); + var objectives = mind.Objectives.ToList(); if (objectives.Count == 0) { shell.WriteLine("None."); diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs index c9cdf244e6..382cb1ab44 100644 --- a/Content.Server/Objectives/ObjectivesSystem.cs +++ b/Content.Server/Objectives/ObjectivesSystem.cs @@ -129,12 +129,12 @@ public sealed class ObjectivesSystem : SharedObjectivesSystem var agentSummary = new StringBuilder(); agentSummary.AppendLine(Loc.GetString("objectives-with-objectives", ("custody", custody), ("title", title), ("agent", agent))); - foreach (var objectiveGroup in objectives.GroupBy(o => Comp(o).Issuer)) + foreach (var objectiveGroup in objectives.GroupBy(o => Comp(o).LocIssuer)) { //TO DO: //check for the right group here. Getting the target issuer is easy: objectiveGroup.Key //It should be compared to the type of the group's issuer. - agentSummary.AppendLine(Loc.GetString($"objective-issuer-{objectiveGroup.Key}")); + agentSummary.AppendLine(objectiveGroup.Key); foreach (var objective in objectiveGroup) { diff --git a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs index e4455c0381..e0a56149b3 100644 --- a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs +++ b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs @@ -59,7 +59,7 @@ public sealed class HelpProgressConditionSystem : EntitySystem if (!TryComp(traitor, out var mind)) continue; - foreach (var objective in mind.AllObjectives) + foreach (var objective in mind.Objectives) { if (HasComp(objective)) removeList.Add(traitor); @@ -88,7 +88,7 @@ public sealed class HelpProgressConditionSystem : EntitySystem if (TryComp(target, out var mind)) { - foreach (var objective in mind.AllObjectives) + foreach (var objective in mind.Objectives) { // this has the potential to loop forever, anything setting target has to check that there is no HelpProgressCondition. var info = _objectives.GetInfo(objective, target, mind); diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs index 8fe7e7e203..0671c6b67e 100644 --- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs @@ -23,7 +23,7 @@ public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem if (args.Cancelled) return; - foreach (var objective in args.Mind.AllObjectives) + foreach (var objective in args.Mind.Objectives) { if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective)) { diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index fced03bfab..f5df04037e 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -78,7 +78,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotFlags.NONE) { // check if entity is valid - if (proto.Abstract || proto.NoSpawn) + if (proto.Abstract || proto.HideSpawnMenu) return false; // check if it is marked as valid chameleon target diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index bf1065c1b1..ba365daf15 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -370,7 +370,7 @@ public abstract class SharedMindSystem : EntitySystem if (Resolve(mindId, ref mind)) { var query = GetEntityQuery(); - foreach (var uid in mind.AllObjectives) + foreach (var uid in mind.Objectives) { if (query.TryGetComponent(uid, out objective)) { diff --git a/Content.Shared/Objectives/Components/ObjectiveComponent.cs b/Content.Shared/Objectives/Components/ObjectiveComponent.cs index 36d3fa0bde..fb2e6ca0a6 100644 --- a/Content.Shared/Objectives/Components/ObjectiveComponent.cs +++ b/Content.Shared/Objectives/Components/ObjectiveComponent.cs @@ -22,8 +22,11 @@ public sealed partial class ObjectiveComponent : Component /// /// Organisation that issued this objective, used for grouping and as a header above common objectives. /// - [DataField(required: true)] - public string Issuer = string.Empty; + [DataField("issuer", required: true)] + private LocId Issuer { get; set; } + + [ViewVariables(VVAccess.ReadOnly)] + public string LocIssuer => Loc.GetString(Issuer); /// /// Unique objectives can only have 1 per prototype id. diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index b80a9b57e4..154ca6c51a 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -25,14 +25,14 @@ namespace Content.Shared.Slippery /// [DataField, AutoNetworkedField] [Access(Other = AccessPermissions.ReadWrite)] - public float ParalyzeTime = 3f; + public float ParalyzeTime = 1.5f; /// /// The entity's speed will be multiplied by this to slip it forwards. /// [DataField, AutoNetworkedField] [Access(Other = AccessPermissions.ReadWrite)] - public float LaunchForwardsMultiplier = 1f; + public float LaunchForwardsMultiplier = 1.5f; /// /// If this is true, any slipping entity loses its friction until diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0b965b1970..fd909d6b12 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,55 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Ghosts can no longer trigger artifacts by examining them. - type: Fix - id: 6422 - time: '2024-04-22T22:46:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27249 -- author: Tyzemol - changes: - - message: Slimes no longer absorb all items used on them - type: Fix - id: 6423 - time: '2024-04-23T08:48:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27260 -- author: Rainbeon - changes: - - message: Suit sensor vitals now function again. - type: Fix - id: 6424 - time: '2024-04-23T08:57:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27259 -- author: Ghagliiarghii - changes: - - message: Security can now find replacements for their trusty Combat Knife in the - SecVend, or craft them with the Sec Lathe. - type: Tweak - id: 6425 - time: '2024-04-23T11:24:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27224 -- author: Whisper - changes: - - message: Fire stack limit reduced from 20 to 10. Fire transfers will be less effective, - and fires will not last as long. - type: Tweak - id: 6426 - time: '2024-04-23T11:30:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27159 -- author: brainfood1183 - changes: - - message: Directional Exit signs for maints! - type: Add - id: 6427 - time: '2024-04-23T11:31:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26831 -- author: pigeonpeas - changes: - - message: Adds the ability to purchase emitters in cargo. - type: Add - id: 6428 - time: '2024-04-23T11:34:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27229 - author: EmoGarbage404 changes: - message: Fixed cargo telepads not teleporting in orders from linked consoles. @@ -3805,3 +3754,53 @@ id: 6921 time: '2024-07-14T15:12:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29959 +- author: Winkarst-cpu + changes: + - message: Now addgamerule command processes only valid game rules. + type: Fix + id: 6922 + time: '2024-07-15T19:18:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29912 +- author: Jezithyr + changes: + - message: Removed the Geras ability from Slimes + type: Remove + id: 6923 + time: '2024-07-16T22:50:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29731 +- author: K-Dynamic + changes: + - message: nerfed paraylze timer of all slippable objects (including soaps, water + puddles, and clown-related items) + type: Tweak + id: 6924 + time: '2024-07-16T23:26:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27879 +- author: EmoGarbage404 + changes: + - message: Resprited wall signs. + type: Tweak + id: 6925 + time: '2024-07-17T04:35:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29806 +- author: lzk228 + changes: + - message: Added health examine for caustic and cold damage. + type: Add + id: 6926 + time: '2024-07-17T06:19:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29989 +- author: lzk228 + changes: + - message: Surgery saws now are normal-sized (no more pocket circular saw). + type: Tweak + id: 6927 + time: '2024-07-17T06:26:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29995 +- author: Winkarst-cpu + changes: + - message: The super door remote is now able to control Syndicate doors. + type: Fix + id: 6928 + time: '2024-07-17T13:50:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30033 diff --git a/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl b/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl index aadf69c3b4..1bbd523c22 100644 --- a/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl +++ b/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl @@ -1,3 +1,5 @@ +cp14-objective-issuer-expedition = [color=#fcae38]Expedition oobjective[/color] + cp14-objective-expedition-collect-title = Collect { $itemName } cp14-objective-expedition-collect-desc = Your objective is to collect and deliver { $itemName } to the Elemental Ship. cp14-objective-expedition-collect-multiply-desc = Your objective is to collect and deliver { $count } { $itemName } to the Elemental ship. \ No newline at end of file diff --git a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl index ddd6de2367..ac536a1e25 100644 --- a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl +++ b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl @@ -16,3 +16,11 @@ health-examinable-carbon-Heat-50 = [color=orange]{ CAPITALIZE(SUBJECT($target)) health-examinable-carbon-Heat-75 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe third-degree burns across { POSS-ADJ($target) } body![/color] health-examinable-carbon-Shock-50 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } electrical shock marks across { POSS-ADJ($target) } body![/color] + +health-examinable-carbon-Cold-25 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } minor frostbite across { POSS-ADJ($target) } body.[/color] +health-examinable-carbon-Cold-50 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major frostbite across { POSS-ADJ($target) } body.[/color] +health-examinable-carbon-Cold-75 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe third-degree frostbite across { POSS-ADJ($target) } body![/color] + +health-examinable-carbon-Caustic-25 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } minor chemical burns.[/color] +health-examinable-carbon-Caustic-50 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } chemical burns across { POSS-ADJ($target) } body.[/color] +health-examinable-carbon-Caustic-75 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe chemical burns all over { POSS-ADJ($target) } body![/color] diff --git a/Resources/Locale/en-US/replays/replays.ftl b/Resources/Locale/en-US/replays/replays.ftl index 7a7e551b3e..4722f4c56b 100644 --- a/Resources/Locale/en-US/replays/replays.ftl +++ b/Resources/Locale/en-US/replays/replays.ftl @@ -41,3 +41,5 @@ replay-verb-spectate = Spectate cmd-replay-spectate-help = replay_spectate [optional entity] cmd-replay-spectate-desc = Attaches or detaches the local player to a given entity uid. cmd-replay-spectate-hint = Optional EntityUid + +cmd-replay-toggleui-desc = Toggles the replay control UI. diff --git a/Resources/Locale/ru-RU/_CP14/objectives/condition/expedition.ftl b/Resources/Locale/ru-RU/_CP14/objectives/condition/expedition.ftl index 31f933aa17..eedd5594a2 100644 --- a/Resources/Locale/ru-RU/_CP14/objectives/condition/expedition.ftl +++ b/Resources/Locale/ru-RU/_CP14/objectives/condition/expedition.ftl @@ -1,3 +1,5 @@ +cp14-objective-issuer-expedition = [color=#fcae38]Цель экспедиции[/color] + cp14-objective-expedition-collect-title = Добыть { $itemName } cp14-objective-expedition-collect-desc = Ваша задача - добыть и доставить { $itemName } на Элементальный корабль. cp14-objective-expedition-collect-multiply-desc = Ваша задача - добыть и доставить { $count } { $itemName } на Элементальный корабль. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 9bd10c8ef0..c9dc048cd3 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -784,7 +784,7 @@ description: uplink-slipocalypse-clustersoap-desc productEntity: SlipocalypseClusterSoap cost: - Telecrystal: 3 + Telecrystal: 2 categories: - UplinkDisruption diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index fecf9f19a4..62bb923a61 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -113,7 +113,6 @@ components: - type: Clickable - type: Slippery - launchForwardsMultiplier: 2.0 - type: Transform noRot: true anchored: true diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index caa3690e5d..6d5c8697f4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -53,7 +53,6 @@ - type: Damageable damageContainer: Biological damageModifierSet: Slime - - type: Geras - type: PassiveDamage # Around 8 damage a minute healed allowedStates: - Alive diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 4d5239e50c..02e2791e35 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -26,6 +26,30 @@ layerKey: dummy parameterTexture: displacementMap parameterUV: displacementUV + eyes: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: eyes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + gloves: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: hand + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + back: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: back + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV - type: Speech speechVerb: Vox speechSounds: Vox @@ -124,4 +148,28 @@ layerKey: dummy parameterTexture: displacementMap parameterUV: displacementUV + eyes: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: eyes + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + gloves: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: hand + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV + back: + layer: + sprite: Mobs/Species/Vox/displacement.rsi + state: back + copyToShaderParameters: + layerKey: dummy + parameterTexture: displacementMap + parameterUV: displacementUV diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index fae4711310..3a555beebf 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -99,6 +99,8 @@ - Piercing - Heat - Shock + - Cold + - Caustic - type: DamageOnHighSpeedImpact damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index a74e3450e9..b2375a2dbf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -311,7 +311,6 @@ sprite: Objects/Specific/Hydroponics/banana.rsi heldPrefix: peel - type: Slippery - launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: CollisionWake @@ -388,7 +387,6 @@ path: /Audio/Effects/slip.ogg params: volume: -100 - launchForwardsMultiplier: 1.6 - type: entity name: bananium peel @@ -402,8 +400,6 @@ sprite: Objects/Materials/materials.rsi heldPrefix: peel - type: Slippery - paralyzeTime: 4 - launchForwardsMultiplier: 2 - type: entity name: carrot diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml index a368ec2b65..623efa7276 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -160,3 +160,5 @@ - AllAccess tags: - CentralCommand + - NuclearOperative + - SyndicateAgent diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index bf0b7190b5..04b023248e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -257,9 +257,7 @@ borderColor: "#C18199" - type: Icon state: pda-clown - - type: Slippery - paralyzeTime: 4 - launchForwardsMultiplier: 1.5 + - type: Slippery # secretly made of bananium - type: StepTrigger - type: CollisionWake enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml index 6359f659b5..7fbb4aecf6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml @@ -2,7 +2,7 @@ id: Wristwatch parent: BaseItem name: wristwatch - description: A cheap watch for telling time. How much did you waste working on this shift? + description: A cheap watch for telling time. How much did you waste playing Space Station 14? components: - type: Sprite sprite: Objects/Devices/wristwatch.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml index 8cb3d88ede..243a816a47 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -162,8 +162,6 @@ sound: path: /Audio/Items/bikehorn.ogg - type: Slippery - paralyzeTime: 4 - launchForwardsMultiplier: 1.5 - type: StepTrigger - type: CollisionWake enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml index 8f3fc21137..e4b9af61e0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/error.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/error.yml @@ -16,7 +16,8 @@ - ReagentId: Nutriment Quantity: 5 - type: Slippery - launchForwardsMultiplier: 5 + paralyzeTime: 3 + launchForwardsMultiplier: 3 - type: StepTrigger intersectRatio: 0.2 - type: CollisionWake @@ -28,14 +29,14 @@ slips: shape: !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" + bounds: "-0.4,-0.3,0.4,0.3" hard: false layer: - SlipLayer fix1: shape: !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" + bounds: "-0.4,-0.3,0.4,0.3" density: 30 mask: - ItemMask diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml index 9561fa3538..02feda953f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml @@ -108,8 +108,6 @@ - type: Transform anchored: true - type: Slippery - paralyzeTime: 2 - launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: Physics diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 5678de6baf..efb93a8868 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -21,8 +21,6 @@ sprite: Objects/Specific/Janitorial/soap.rsi storedRotation: -90 - type: Slippery - paralyzeTime: 2 - launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: CollisionWake @@ -129,8 +127,8 @@ - type: SolutionContainerVisuals fillBaseName: syndie- - type: Slippery - paralyzeTime: 5 - launchForwardsMultiplier: 2.5 + paralyzeTime: 3 + launchForwardsMultiplier: 3 - type: Item heldPrefix: syndie - type: FlavorProfile @@ -154,8 +152,8 @@ layers: - state: syndie-soaplet - type: Slippery - paralyzeTime: 5 - launchForwardsMultiplier: 2.5 + paralyzeTime: 1.5 # these things are tiny + launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.04 - type: Item @@ -196,7 +194,6 @@ - type: SolutionContainerVisuals fillBaseName: gibs- - type: Slippery - paralyzeTime: 2 - type: StepTrigger - type: Item heldPrefix: gibs @@ -221,8 +218,8 @@ - type: SolutionContainerVisuals fillBaseName: omega- - type: Slippery - paralyzeTime: 7 - launchForwardsMultiplier: 3 + paralyzeTime: 5.0 + launchForwardsMultiplier: 3.0 - type: Item heldPrefix: omega - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index c4f7798154..8b1606dc5d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -173,12 +173,12 @@ sprite: Objects/Specific/Medical/Surgery/saw.rsi state: saw - type: Item + size: Normal sprite: Objects/Specific/Medical/Surgery/saw.rsi storedRotation: 90 - type: Tool qualities: - Sawing - speedModifier: 1.0 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb. - type: entity @@ -190,6 +190,7 @@ - type: Sprite state: improv - type: Item + size: Small heldPrefix: improv - type: MeleeWeapon damage: @@ -198,8 +199,6 @@ soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Tool - qualities: - - Sawing speedModifier: 0.5 - type: entity @@ -212,7 +211,6 @@ state: electric - type: Item heldPrefix: electric - storedRotation: 90 - type: MeleeWeapon damage: groups: @@ -220,29 +218,19 @@ soundHit: path: /Audio/Items/drill_hit.ogg - type: Tool - qualities: - - Sawing speedModifier: 1.5 - type: entity name: advanced circular saw id: SawAdvanced - parent: Saw + parent: SawElectric description: You think you can cut anything with it. components: - type: Sprite state: advanced - type: Item heldPrefix: advanced - storedRotation: 90 - type: MeleeWeapon attackRate: 1.5 - damage: - groups: - Brute: 15 - soundHit: - path: /Audio/Items/drill_hit.ogg - type: Tool - qualities: - - Sawing speedModifier: 2.0 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 9aac49a6bd..c6ecb5fd30 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -243,6 +243,15 @@ - type: Sprite state: ai +- type: entity + parent: BaseSign + id: SignAiUpload + name: ai upload sign + description: A sign, indicating an AI is present. + components: + - type: Sprite + state: ai_upload + - type: entity parent: BaseSign id: SignArcade @@ -273,11 +282,11 @@ - type: entity parent: BaseSign id: SignAnomaly - name: xenoarchaeology lab sign + name: xenoarcheology lab sign description: A sign indicating the xenoarchaeology lab. components: - type: Sprite - state: anomaly + state: xenoarch - type: entity parent: BaseSign @@ -286,7 +295,7 @@ description: A sign indicating the anomalous research lab. components: - type: Sprite - state: anomaly2 + state: anomaly - type: entity parent: BaseSign @@ -297,15 +306,6 @@ - type: Sprite state: atmos -- type: entity - parent: BaseSign - id: SignAtmosMinsky - name: atmospherics sign - description: A sign indicating the atmospherics area. - components: - - type: Sprite - state: atmominsky - - type: entity parent: BaseSign id: SignBar @@ -315,6 +315,32 @@ - type: Sprite state: bar +- type: entity + parent: BaseSign + id: SignKitchen + name: kitchen sign + description: The heart of the home. And disease. + components: + - type: Sprite + state: kitchen + +- type: entity + parent: BaseSign + id: SignTheater + name: theater sign + description: Would it even be Space Station without drama? + components: + - type: Sprite + layers: + - state: drama1 + map: [ "base" ] + - type: RandomSprite + available: + - base: + drama1: null + drama2: null + drama3: null + - type: entity parent: BaseSign id: SignBarbershop @@ -396,24 +422,6 @@ - type: Sprite state: chem -- type: entity - parent: BaseSign - id: SignChemistry1 - name: chemistry sign - description: A sign indicating the chemistry lab. - components: - - type: Sprite - state: chemistry1 - -- type: entity - parent: BaseSign - id: SignChemistry2 - name: chemistry sign - description: A sign indicating the chemistry lab. - components: - - type: Sprite - state: chemistry2 - - type: entity parent: BaseSign id: SignCloning @@ -427,19 +435,20 @@ parent: BaseSign id: SignConference name: conference room sign - description: A sign indicating the conference room. + description: Where work happens. components: - type: Sprite state: conference_room - type: entity parent: BaseSign - id: SignCourt - name: court sign - description: A sign labelling the courtroom. + id: SignCryo + name: cryosleep sign + description: Just like that? You're gonna chicken out? components: - type: Sprite - state: court + state: cryo + - type: entity parent: BaseSign @@ -461,18 +470,27 @@ - type: entity parent: BaseSign - id: SignDrones - name: drones sign - description: A sign indicating drones. + id: SignRestroom + name: restroom sign + description: A sign indicating where you go to... What do you do here again? components: - type: Sprite - state: drones + state: restroom + +- type: entity + parent: BaseSign + id: SignMaterials + name: materials sign + description: An omen to the juicy vault of steel, glass, and plastic that lays before you. + components: + - type: Sprite + state: mats - type: entity parent: BaseSign id: SignEngine - name: engine sign - description: A sign indicating the engine room. + name: power sign + description: Where the powa happens. components: - type: Sprite state: engine @@ -544,7 +562,7 @@ parent: BaseSign id: SignHead name: head sign - description: A sign with a hat on it. + description: An official sign indicating the dwellings of a Nanotrasen-certified head of department. components: - type: Sprite state: commander @@ -556,25 +574,7 @@ description: A sign indicating a hydroponics area. components: - type: Sprite - state: hydro1 - -- type: entity - parent: BaseSign - id: SignHydro2 - name: hydro sign - description: A sign indicating a hydroponics area. - components: - - type: Sprite - state: hydro2 - -- type: entity - parent: BaseSign - id: SignHydro3 - name: hydro sign - description: A sign indicating a hydroponics area. - components: - - type: Sprite - state: hydro3 + state: hydro - type: entity parent: BaseSign @@ -606,8 +606,8 @@ - type: entity parent: BaseSign id: SignLawyer - name: lawyer sign - description: A sign labelling an area where the Lawyers work. + name: law sign + description: A sign indicating the presence of the (typically absent) rule of law. components: - type: Sprite state: law @@ -639,15 +639,6 @@ - type: Sprite state: medbay -- type: entity - parent: BaseSign - id: SignMinerDock - name: miner dock sign - description: A sign indicating the miner dock. - components: - - type: Sprite - state: miner_dock - - type: entity parent: BaseSign id: SignMorgue @@ -740,36 +731,27 @@ - type: entity parent: BaseSign - id: SignScience1 - name: science sign - description: A sign indicating the science area. + id: SignServer + name: server sign + description: Ever heard of Big Data? This is it, chump. The biggest. components: - type: Sprite - state: science1 + state: data - type: entity parent: BaseSign - id: SignScience2 - name: science sign - description: A sign indicating the science area. + id: SignCans + name: canisters sign + description: A sign indicating the auspicious presence of gas canisters. components: - type: Sprite - state: science2 - -- type: entity - parent: BaseSign - id: SignShield - name: shield sign - description: A sign with a shield. - components: - - type: Sprite - state: shield + state: cans - type: entity parent: BaseSign id: SignShipDock - name: docking sign - description: A sign indicating the ship docking area. + name: evac sign + description: A sign indicating the where the evac shuttle will (likely) arrive. components: - type: Sprite state: dock @@ -812,12 +794,12 @@ - type: entity parent: BaseSign - id: SignToxins2 - name: toxins sign - description: A sign indicating the toxin lab. + id: SignVault + name: vault sign + description: A sign indicating the vault. Who knows what secrets lie inside? components: - type: Sprite - state: toxins2 + state: vault - type: entity parent: BaseSign @@ -964,29 +946,11 @@ - type: Sprite state: xenobio -- type: entity - parent: BaseSign - id: SignXenobio2 - name: xenobio sign - description: A sign indicating the xenobiology lab. - components: - - type: Sprite - state: xenobio2 - -- type: entity - parent: BaseSign - id: SignXenolab - name: xenolab sign - description: A sign indicating the xenobiology lab. - components: - - type: Sprite - state: xenolab - - type: entity parent: BaseSign id: SignZomlab name: zombie lab sign - description: A sign indicating the zombie lab. + description: The final remains of a shut-down Nanotrasen research project that aimed to harness the powers of Romerol. I wonder how that went... components: - type: Sprite state: zomlab diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml index c9a6ec2844..fa8cfdd001 100644 --- a/Resources/Prototypes/Entities/Tiles/bananium.yml +++ b/Resources/Prototypes/Entities/Tiles/bananium.yml @@ -44,8 +44,6 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Slippery - paralyzeTime: 2 - launchForwardsMultiplier: 1.5 - type: StepTrigger intersectRatio: 0.2 - type: Physics diff --git a/Resources/Prototypes/Objectives/dragon.yml b/Resources/Prototypes/Objectives/dragon.yml index 10ca942cb3..bbdac8faa1 100644 --- a/Resources/Prototypes/Objectives/dragon.yml +++ b/Resources/Prototypes/Objectives/dragon.yml @@ -6,7 +6,7 @@ - type: Objective # difficulty isn't used at all since objective are fixed difficulty: 1.5 - issuer: dragon + issuer: objective-issuer-dragon - type: RoleRequirement roles: components: diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml index 77628a68cf..4d0cf6c17c 100644 --- a/Resources/Prototypes/Objectives/ninja.yml +++ b/Resources/Prototypes/Objectives/ninja.yml @@ -6,7 +6,7 @@ - type: Objective # difficulty isn't used since all objectives are picked difficulty: 1.5 - issuer: spiderclan + issuer: objective-issuer-spiderclan - type: RoleRequirement roles: components: diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 8b5307e9a0..cc94ab02b3 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -4,7 +4,7 @@ id: BaseThiefObjective components: - type: Objective - issuer: thief + issuer: objective-issuer-thief - type: RoleRequirement roles: components: diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index ad5f56a443..edf191b420 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -4,7 +4,7 @@ id: BaseTraitorObjective components: - type: Objective - issuer: syndicate + issuer: objective-issuer-syndicate - type: RoleRequirement roles: components: diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index da02fc666d..a6b53be688 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -77,8 +77,6 @@ meltingPoint: 18.2 tileReactions: - !type:SpillTileReaction - paralyzeTime: 3 - launchForwardsMultiplier: 2 requiredSlipSpeed: 1 superSlippery: true diff --git a/Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml b/Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml index 1869329027..1b713d52a0 100644 --- a/Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml +++ b/Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml @@ -4,7 +4,7 @@ id: CP14BaseExpeditionObjective components: - type: Objective - issuer: ExpeditionObjective + issuer: cp14-objective-issuer-expedition - type: entity abstract: true diff --git a/Resources/ServerInfo/Guidebook/Service/Chef.xml b/Resources/ServerInfo/Guidebook/Service/Chef.xml index e0692b889b..79eb81468c 100644 --- a/Resources/ServerInfo/Guidebook/Service/Chef.xml +++ b/Resources/ServerInfo/Guidebook/Service/Chef.xml @@ -54,7 +54,6 @@ Ask Botany for what you need, without a botanist, you may need to grow more plan - ## Gathering Milk: Alt-Click on a Cow with a container in your hand. (Beakers, Buckets, Milk Jugs, ect.) diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png deleted file mode 100644 index b7f2122c19..0000000000 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json index ccb1c5dcaf..88e3ebd509 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json @@ -1 +1,26 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-HAND-vox", "directions": 4}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png index fa32996aa8..a6546c4655 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png index ce7c029026..2ecf1e68e0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png index 6d96d0a037..7d73e55461 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png index f83538ee60..bcf14c7791 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png index 58b84263ac..eaef945508 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png index 547839061b..b9da47830b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png index fa9a53d373..03a4e52f7b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png index 9cba3e8ef3..1824ac30a7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png index 89369f8794..f99be74a5a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png index 973451e5f5..d4813efe64 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png index e432bb2d01..38b48d0a2d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png index 2363b4118d..ca6d049a1f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..77af7765e5 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json index 8eb6b8a626..b0c4419dda 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. Vox state modified from jackboots.rsi by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..dc22be4ac2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json index 2880b8eec4..6b1053d8ea 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser.", + "copyright": "Drawn by Ubaser. Vox states made by Flareguy, modified from magboots.rsi", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..04605be106 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..ff5c3a0589 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json index 3aa61e31c5..7c3599192c 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404", + "copyright": "Created by EmoGarbage404. Vox states made by Flareguy, modified from magboots.rsi", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..66ae1ee7e8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png index 50627ac522..9072c9f4fc 100644 Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png new file mode 100644 index 0000000000..c300bba8a5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png new file mode 100644 index 0000000000..f705c337de Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png new file mode 100644 index 0000000000..4a0266dfd3 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json index 6ea6c552b9..81bdd40e0c 100644 --- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PJB3005", + "copyright": "jumpsuit state made by PJB3005. back, hand, and eyes states made by Flareguy", "size": { "x": 32, "y": 32 @@ -13,6 +13,18 @@ { "name": "jumpsuit", "directions": 4 + }, + { + "name": "back", + "directions": 4 + }, + { + "name": "hand", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png index 841d409735..3910fb39a6 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png index 6cee540a6b..e532ec039e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png new file mode 100644 index 0000000000..91256aa1df Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png index e5b69da718..6b7361f21c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png deleted file mode 100644 index 73d94ac95e..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png index 9f36d43776..7cb1844352 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png index 671e57aa5c..3f237ec046 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png index 0dfa8a04f5..9d57ebe7e9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png deleted file mode 100644 index 3bd5488a62..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png index 9441b32827..ae31db348b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png index e5fb2ab766..8fdc8016af 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png index d196072a32..b01a82717f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png index ae86efe496..9c2f15e048 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png index e34d8cf8f2..838ffa7b24 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png new file mode 100644 index 0000000000..53cdbbb5c9 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png index bf0176ea97..0366a82ffa 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png index df7ee4cf11..4b07e410e2 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png index 635f00ec53..a862131d76 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png index 71739f2d4a..f8b42e9e6a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png deleted file mode 100644 index d1c1ac9184..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png deleted file mode 100644 index f9864f7d44..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png index ecbc9370c1..da9434fcfb 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png index d66b76011f..f98c0a440b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png index c3d20f31b8..0823ef3943 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png deleted file mode 100644 index fbb8c50593..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png new file mode 100644 index 0000000000..3a0fc6d716 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png new file mode 100644 index 0000000000..03a801e483 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png index 28975a1b12..1fa88f63af 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png index 1716f825bb..8d59357a35 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png index 46f7585812..107ea06c99 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png new file mode 100644 index 0000000000..af0d276d5c Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png new file mode 100644 index 0000000000..538374ce40 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png new file mode 100644 index 0000000000..cba0ec5955 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png deleted file mode 100644 index 3d7e65f7a5..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png index 2d12b080fc..5a70940bd9 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png index 2c4f14d707..629680bfea 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png index 2db7d42645..3e5d2db3c3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png index afe1ce5986..05f0b7c0f5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png index 21eb2e8613..811d40aa89 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png new file mode 100644 index 0000000000..f23fa7960d Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png deleted file mode 100644 index b20654fcd6..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png deleted file mode 100644 index 40d3e546ec..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png deleted file mode 100644 index ccb0e83784..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png index 653caf3907..e5c0b186b4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png index 789a53802c..350f40dabd 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png new file mode 100644 index 0000000000..322d62d8d2 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png index 251e0ebd7b..400e73df42 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png index de6e16d4a6..0a239af288 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png index f397ffe996..ffb43a9ae5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png new file mode 100644 index 0000000000..af933d5b9e Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png index c9c6e1362a..e57571f682 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 97be2aaa0d..a13df6f7d6 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,1490 +5,490 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github, 'arcade', 'barbershop', 'direction_exam', 'direction_icu', 'laundromat', 'news', 'reception', and 'salvage' made by rosieposieeee (github)", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github)", "states": [ { - "name": "ai", - "delays": [ - [ - 1 - ] - ] + "name": "ai" }, { - "name": "anomaly", - "delays": [ - [ - 1 - ] - ] + "name": "ai_upload" }, { - "name": "anomaly2" + "name": "vault" }, { - "name": "arcade", - "delays": [ - [ - 1 - ] - ] + "name": "xenoarch" }, { - "name": "armory", - "delays": [ - [ - 1 - ] - ] + "name": "anomaly" }, { - "name": "barbershop", - "delays": [ - [ - 1 - ] - ] + "name": "arcade" }, { - "name": "ass", - "delays": [ - [ - 1 - ] - ] + "name": "armory" }, { - "name": "atmos", - "delays": [ - [ - 1 - ] - ] + "name": "barbershop" }, { - "name": "atmos_air", - "delays": [ - [ - 1 - ] - ] + "name": "ass" }, { - "name": "atmos_co2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos" }, { - "name": "atmos_n2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_air" }, { - "name": "atmos_n2o", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_co2" }, { - "name": "atmos_o2", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_n2" }, { - "name": "atmos_plasma", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_n2o" }, { - "name": "atmos_tritium", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_o2" }, { - "name": "atmos_waste", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_plasma" }, { - "name": "atmosplaque", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_tritium" }, { - "name": "zumosplaque", - "delays": [ - [ - 1 - ] - ] + "name": "atmos_waste" }, { - "name": "bar", - "delays": [ - [ - 1 - ] - ] + "name": "atmosplaque" }, { - "name": "biblio", - "delays": [ - [ - 1 - ] - ] + "name": "zumosplaque" }, { - "name": "bio", - "delays": [ - [ - 1 - ] - ] + "name": "bar" }, { - "name": "biohazard", - "delays": [ - [ - 1 - ] - ] + "name": "biblio" }, { - "name": "bridge", - "delays": [ - [ - 1 - ] - ] + "name": "bio" }, { - "name": "canisters", - "delays": [ - [ - 1 - ] - ] + "name": "biohazard" }, { - "name": "cargo", - "delays": [ - [ - 1 - ] - ] + "name": "bridge" }, { - "name": "cargo_dock", - "delays": [ - [ - 1 - ] - ] + "name": "canisters" }, { - "name": "chapel", - "delays": [ - [ - 1 - ] - ] + "name": "cargo" }, { - "name": "chem", - "delays": [ - [ - 1 - ] - ] + "name": "cargo_dock" }, { - "name": "chemistry1", - "delays": [ - [ - 1 - ] - ] + "name": "chapel" }, { - "name": "chemistry2", - "delays": [ - [ - 1 - ] - ] + "name": "chem" }, { - "name": "commander", - "delays": [ - [ - 1 - ] - ] + "name": "commander" }, { - "name": "conference_room", - "delays": [ - [ - 1 - ] - ] + "name": "conference_room" }, { - "name": "corrosives", - "delays": [ - [ - 1 - ] - ] + "name": "corrosives" }, { - "name": "court", - "delays": [ - [ - 1 - ] - ] + "name": "cryogenics" }, { - "name": "cryogenics", - "delays": [ - [ - 1 - ] - ] + "name": "danger" }, { - "name": "danger", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "deathsposal", - "delays": [ - [ - 1 - ] - ] + "name": "deathsposal" }, { "name": "direction_bar", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_exam", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_icu", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_janitor", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_food", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_hop", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_library", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_chemistry", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_eng", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_evac", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_supply", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_bridge", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_med", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_sci", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_sec", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_brig", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_chapel", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_hydro", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_dorms", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cryo", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_gravity", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_salvage", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_solar", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_wash", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "dock", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "doors", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "drones", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "electrical", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "eng", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "engine", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "eva", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "examroom", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "explosives", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "fire", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "flammable", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "cloning", - "delays": [ - [ - 1 - ] - ] + "directions": 4 }, { - "name": "gravi", - "delays": [ - [ - 1 - ] - ] + "name": "dock" }, { - "name": "hydro1", - "delays": [ - [ - 1 - ] - ] + "name": "doors" }, { - "name": "hydro2", - "delays": [ - [ - 1 - ] - ] + "name": "mats" }, { - "name": "hydro3", - "delays": [ - [ - 1 - ] - ] + "name": "electrical" }, { - "name": "interrogation", - "delays": [ - [ - 1 - ] - ] + "name": "eng" }, { - "name": "janitor", - "delays": [ - [ - 1 - ] - ] + "name": "engine" }, { - "name": "laser", - "delays": [ - [ - 1 - ] - ] + "name": "eva" }, { - "name": "laundromat", - "delays": [ - [ - 1 - ] - ] + "name": "examroom" }, { - "name": "law", - "delays": [ - [ - 1 - ] - ] + "name": "explosives" }, { - "name": "magnetics", - "delays": [ - [ - 1 - ] - ] + "name": "fire" }, { - "name": "mail", - "delays": [ - [ - 1 - ] - ] + "name": "flammable" }, { - "name": "medbay", - "delays": [ - [ - 1 - ] - ] + "name": "cloning" }, { - "name": "memetic", - "delays": [ - [ - 1 - ] - ] + "name": "gravi" }, { - "name": "miner_dock", - "delays": [ - [ - 1 - ] - ] + "name": "hydro" }, { - "name": "monkey_painting", - "delays": [ - [ - 1 - ] - ] + "name": "interrogation" }, { - "name": "morgue", - "delays": [ - [ - 1 - ] - ] + "name": "janitor" }, { - "name": "news", - "delays": [ - [ - 1 - ] - ] + "name": "laser" }, { - "name": "nosmoking", - "delays": [ - [ - 1 - ] - ] + "name": "laundromat" }, { - "name": "nosmoking2", - "delays": [ - [ - 1 - ] - ] + "name": "law" }, { - "name": "surgery", - "delays": [ - [ - 1 - ] - ] + "name": "magnetics" }, { - "name": "optical", - "delays": [ - [ - 1 - ] - ] + "name": "mail" }, { - "name": "oxidants", - "delays": [ - [ - 1 - ] - ] + "name": "medbay" }, { - "name": "pods", - "delays": [ - [ - 1 - ] - ] + "name": "memetic" }, { - "name": "prison", - "delays": [ - [ - 1 - ] - ] + "name": "monkey_painting" }, { - "name": "psychology", - "delays": [ - [ - 1 - ] - ] + "name": "morgue" }, { - "name": "radiation", - "delays": [ - [ - 1 - ] - ] + "name": "news" }, { - "name": "reception", - "delays": [ - [ - 1 - ] - ] + "name": "kitchen" }, { - "name": "rnd", - "delays": [ - [ - 1 - ] - ] + "name": "drama1" }, { - "name": "robo", - "delays": [ - [ - 1 - ] - ] + "name": "drama2" }, { - "name": "salvage", - "delays": [ - [ - 1 - ] - ] + "name": "drama3" }, { - "name": "sci", - "delays": [ - [ - 1 - ] - ] + "name": "restroom" }, { - "name": "science1", - "delays": [ - [ - 1 - ] - ] + "name": "nosmoking" }, { - "name": "science2", - "delays": [ - [ - 1 - ] - ] + "name": "nosmoking2" }, { - "name": "secure", - "delays": [ - [ - 1 - ] - ] + "name": "surgery" }, { - "name": "securearea", - "delays": [ - [ - 1 - ] - ] + "name": "optical" }, { - "name": "shield", - "delays": [ - [ - 1 - ] - ] + "name": "oxidants" }, { - "name": "shock", - "delays": [ - [ - 1 - ] - ] + "name": "pods" }, { - "name": "something-old1", - "delays": [ - [ - 1 - ] - ] + "name": "prison" }, { - "name": "something-old2", - "delays": [ - [ - 1 - ] - ] + "name": "psychology" }, { - "name": "space", - "delays": [ - [ - 1 - ] - ] + "name": "radiation" }, { - "name": "telecoms", - "delays": [ - [ - 1 - ] - ] + "name": "reception" }, { - "name": "toxins2", - "delays": [ - [ - 1 - ] - ] + "name": "rnd" }, { - "name": "toxins", - "delays": [ - [ - 1 - ] - ] + "name": "robo" }, { - "name": "virology", - "delays": [ - [ - 1 - ] - ] + "name": "salvage" }, { - "name": "xenobio", - "delays": [ - [ - 1 - ] - ] + "name": "sci" }, { - "name": "xenobio2", - "delays": [ - [ - 1 - ] - ] + "name": "secure" }, { - "name": "xenolab", - "delays": [ - [ - 1 - ] - ] + "name": "securearea" }, { - "name": "zomlab", - "delays": [ - [ - 1 - ] - ] + "name": "cans" }, { - "name": "small_secure_red", - "delays": [ - [ - 1 - ] - ] + "name": "shock" }, { - "name": "small_secure", - "delays": [ - [ - 1 - ] - ] + "name": "something-old1" }, { - "name": "medium_secure_red", - "delays": [ - [ - 1 - ] - ] + "name": "something-old2" }, { - "name": "medium_blank", - "delays": [ - [ - 1 - ] - ] + "name": "space" }, { - "name": "medium_magnetics", - "delays": [ - [ - 1 - ] - ] + "name": "telecoms" }, { - "name": "medium_danger", - "delays": [ - [ - 1 - ] - ] + "name": "toxins" }, { - "name": "medium_explosives", - "delays": [ - [ - 1 - ] - ] + "name": "virology" }, { - "name": "medium_cryogenics", - "delays": [ - [ - 1 - ] - ] + "name": "xenobio" }, { - "name": "medium_electrical", - "delays": [ - [ - 1 - ] - ] + "name": "zomlab" }, { - "name": "medium_biohazard", - "delays": [ - [ - 1 - ] - ] + "name": "small_secure_red" }, { - "name": "medium_radiation", - "delays": [ - [ - 1 - ] - ] + "name": "small_secure" }, { - "name": "medium_flammable", - "delays": [ - [ - 1 - ] - ] + "name": "medium_secure_red" }, { - "name": "medium_laser", - "delays": [ - [ - 1 - ] - ] + "name": "medium_blank" }, { - "name": "medium_secure", - "delays": [ - [ - 1 - ] - ] + "name": "medium_magnetics" }, { - "name": "goldenplaque", - "delays": [ - [ - 1 - ] - ] + "name": "medium_danger" }, { - "name": "kiddieplaque", - "delays": [ - [ - 1 - ] - ] + "name": "medium_explosives" }, { - "name": "security", - "delays": [ - [ - 1 - ] - ] + "name": "medium_cryogenics" }, { - "name": "nanotrasen_sign1", - "delays": [ - [ - 1 - ] - ] + "name": "medium_electrical" }, { - "name": "nanotrasen_sign2", - "delays": [ - [ - 1 - ] - ] + "name": "medium_biohazard" }, { - "name": "nanotrasen_sign3", - "delays": [ - [ - 1 - ] - ] + "name": "medium_radiation" }, { - "name": "nanotrasen_sign4", - "delays": [ - [ - 1 - ] - ] + "name": "medium_flammable" }, { - "name": "nanotrasen_sign5", - "delays": [ - [ - 1 - ] - ] + "name": "medium_laser" }, { - "name": "atmominsky", - "delays": [ - [ - 1 - ] - ] - }, + "name": "medium_secure" + }, + { + "name": "goldenplaque" + }, + { + "name": "kiddieplaque" + }, + { + "name": "security" + }, + { + "name": "data" + }, + { + "name": "cryo" + }, + { + "name": "nanotrasen_sign1" + }, + { + "name": "nanotrasen_sign2" + }, + { + "name": "nanotrasen_sign3" + }, + { + "name": "nanotrasen_sign4" + }, + { + "name": "nanotrasen_sign5" + }, { - "name": "one", - "delays": [ - [ - 1 - ] - ] - }, + "name": "one" + }, { - "name": "two", - "delays": [ - [ - 1 - ] - ] - }, + "name": "two" + }, { - "name": "three", - "delays": [ - [ - 1 - ] - ] - }, + "name": "three" + }, { - "name": "four", - "delays": [ - [ - 1 - ] - ] - }, + "name": "four" + }, { - "name": "five", - "delays": [ - [ - 1 - ] - ] - }, + "name": "five" + }, { - "name": "six", - "delays": [ - [ - 1 - ] - ] - }, + "name": "six" + }, { - "name": "seven", - "delays": [ - [ - 1 - ] - ] - }, + "name": "seven" + }, { - "name": "eight", - "delays": [ - [ - 1 - ] - ] - }, + "name": "eight" + }, { - "name": "nine", - "delays": [ - [ - 1 - ] - ] - }, + "name": "nine" + }, { - "name": "zero", - "delays": [ - [ - 1 - ] - ] - }, + "name": "zero" + }, { - "name": "survival", - "delays": [ - [ - 1 - ] - ] - }, + "name": "survival" + }, { - "name": "ntmining", - "delays": [ - [ - 1 - ] - ] + "name": "ntmining" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png deleted file mode 100644 index a9444f1ed6..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png index 1dc0e7d1a9..9572993807 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png index 575d943c76..40b73c7c2d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png index a6fe5ca1f3..cea5bba81a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png index 9b0761c1bb..1d89a1ec59 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png index b16670d5b5..3f3e6dfa49 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png new file mode 100644 index 0000000000..f5903a7d15 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png index 875b57204b..3dc284f479 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png index 5b3bb6e83d..82519ba966 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png index 8c51238f89..20b0eb577d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png index eb3afab2f8..599207f48a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png deleted file mode 100644 index 7c67901ec4..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png deleted file mode 100644 index 7722ef8303..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png index 7e27efa2b3..2de5d34a5e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png deleted file mode 100644 index bb88d2a770..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png index 214650d6db..b9286eb06d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png index 254ada76fd..f24ba5c1b3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png index e1e721de4a..5896206caf 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png index 6c28bfde00..cf11ed6155 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png deleted file mode 100644 index c2c35212d0..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png new file mode 100644 index 0000000000..33572ca25b Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png index b83297d037..232d9a74b5 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png new file mode 100644 index 0000000000..a4b26daa99 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png index 0d9336c01a..4f99ab19c3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png deleted file mode 100644 index 3e8515dda0..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png deleted file mode 100644 index 21eb486835..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png index 09d54e603d..a81784d30b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png differ diff --git a/Resources/Textures/Template/signs.png b/Resources/Textures/Template/signs.png new file mode 100644 index 0000000000..4dc483183b Binary files /dev/null and b/Resources/Textures/Template/signs.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 9448ce00be..9559d1a4ec 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -393,3 +393,19 @@ BookChefGaming: BookHowToCookForFortySpaceman #2024-06-29 IntercomAssesmbly: IntercomAssembly + +# 2024-07-7 +SignScience1: SignScience +SignScience2: SignScience +SignXenobio2: SignXenobio +SignXenolab: SignXenobio +SignToxins2: SignToxins +SignMinerDock: SignShipDock +SignChemistry1: SignChem +SignChemistry2: SignChem +SignCourt: SignLawyer +SignAtmosMinsky: SignAtmos +SignDrones: SignMaterials +SignShield: null # what was this even for? +SignHydro2: SignHydro1 +SignHydro3: SignHydro1 diff --git a/Tools/actions_changelog_rss.py b/Tools/actions_changelog_rss.py index 01ca7852cc..5c696f5b01 100755 --- a/Tools/actions_changelog_rss.py +++ b/Tools/actions_changelog_rss.py @@ -35,7 +35,7 @@ SSH_PORT = 22 RSS_FILE = "changelog.xml" XSL_FILE = "stylesheet.xsl" HOST_KEYS = [ - "AAAAC3NzaC1lZDI1NTE5AAAAIEE8EhnPjb3nIaAPTXAJHbjrwdGGxHoM0f1imCK0SygD" + "AAAAC3NzaC1lZDI1NTE5AAAAIOBpGO/Qc6X0YWuw7z+/WS/65+aewWI29oAyx+jJpCmh" ] # RSS feed parameters, change these