diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs index 97ddc15000..24e5cfdfab 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs @@ -14,6 +14,9 @@ namespace Content.Client.Administration.UI.Notes; [GenerateTypedNameReferences] public sealed partial class AdminNotesLine : BoxContainer { + [Dependency] private readonly ILogManager _logManager = default!; + + private readonly ISawmill _sawmill = default!; private readonly SpriteSystem _sprites; private const string AdminNotesTextureBase = "/Textures/Interface/AdminNotes/"; @@ -33,6 +36,8 @@ public sealed partial class AdminNotesLine : BoxContainer public AdminNotesLine(SpriteSystem sprites, SharedAdminNote note) { RobustXamlLoader.Load(this); + + _sawmill = _logManager.GetSawmill("admin.notes"); _sprites = sprites; Note = note; @@ -61,7 +66,7 @@ public sealed partial class AdminNotesLine : BoxContainer if (iconPath is null) { SeverityRect.Visible = false; - Logger.WarningS("admin.notes", $"Could not find an icon for note ID {Note.Id}"); + _sawmill.Warning($"Could not find an icon for note ID {Note.Id}"); } else { diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs index e1197d4ac4..bb30ca1c55 100644 --- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs +++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs @@ -37,8 +37,7 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem(); _spriteSystem = _entManager.System(); @@ -284,7 +288,7 @@ namespace Content.Client.Construction.UI if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId)) { - Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.", + _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.", recipe.ID, nameof(ConstructionPrototype)); continue; diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs index 8bc1a834fc..37ec1ac2de 100644 --- a/Content.Client/Guidebook/DocumentParsingManager.cs +++ b/Content.Client/Guidebook/DocumentParsingManager.cs @@ -7,7 +7,6 @@ using Robust.Client.UserInterface; using Robust.Shared.ContentPack; using Robust.Shared.Prototypes; using Robust.Shared.Reflection; -using Robust.Shared.Sandboxing; using Robust.Shared.Utility; using static Pidgin.Parser; @@ -21,7 +20,7 @@ public sealed partial class DocumentParsingManager [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IReflectionManager _reflectionManager = default!; [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly ISandboxHelper _sandboxHelper = default!; + [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!; private readonly Dictionary> _tagControlParsers = new(); private Parser _controlParser = default!; @@ -43,7 +42,7 @@ public sealed partial class DocumentParsingManager foreach (var typ in _reflectionManager.GetAllChildren()) { - _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _sandboxHelper)); + _tagControlParsers.Add(typ.Name, CreateTagControlParser(typ.Name, typ, _dynamicTypeFactory)); } ControlParser = whitespaceAndCommentParser.Then(_controlParser.Many()); @@ -51,22 +50,22 @@ public sealed partial class DocumentParsingManager _sawmill = Logger.GetSawmill("Guidebook"); } - public bool TryAddMarkup(Control control, ProtoId entryId, bool log = true) + public bool TryAddMarkup(Control control, ProtoId entryId) { if (!_prototype.Resolve(entryId, out var entry)) return false; using var file = _resourceManager.ContentFileReadText(entry.Text); - return TryAddMarkup(control, file.ReadToEnd(), log); + return TryAddMarkup(control, file.ReadToEnd()); } - public bool TryAddMarkup(Control control, GuideEntry entry, bool log = true) + public bool TryAddMarkup(Control control, GuideEntry entry) { using var file = _resourceManager.ContentFileReadText(entry.Text); - return TryAddMarkup(control, file.ReadToEnd(), log); + return TryAddMarkup(control, file.ReadToEnd()); } - public bool TryAddMarkup(Control control, string text, bool log = true) + public bool TryAddMarkup(Control control, string text) { try { @@ -87,14 +86,14 @@ public sealed partial class DocumentParsingManager return true; } - private Parser CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox) + private Parser CreateTagControlParser(string tagId, Type tagType, IDynamicTypeFactory typeFactory) { return Map( (args, controls) => { try { - var tag = (IDocumentTag) sandbox.CreateInstance(tagType); + var tag = (IDocumentTag) typeFactory.CreateInstance(tagType); if (!tag.TryParseTag(args, out var control)) { _sawmill.Error($"Failed to parse {tagId} args"); diff --git a/Content.Client/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs index b6923c3698..82b884aa96 100644 --- a/Content.Client/Guidebook/Richtext/Table.cs +++ b/Content.Client/Guidebook/Richtext/Table.cs @@ -8,6 +8,11 @@ namespace Content.Client.Guidebook.Richtext; [UsedImplicitly] public sealed class Table : TableContainer, IDocumentTag { + [Dependency] private readonly ILogManager _logManager = default!; + + private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill("table"); + private ISawmill? _sawmill; + public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out Control? control) { HorizontalExpand = true; @@ -15,7 +20,7 @@ public sealed class Table : TableContainer, IDocumentTag if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount)) { - Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\""); + Sawmill.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\""); control = null; return false; } diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs index a551b18473..5c0098d5b5 100644 --- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs +++ b/Content.Client/Guidebook/Richtext/TextLinkTag.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -12,6 +12,11 @@ namespace Content.Client.Guidebook.RichText; [UsedImplicitly] public sealed class TextLinkTag : IMarkupTagHandler { + [Dependency] private readonly ILogManager _logManager = default!; + + private ISawmill Sawmill => _sawmill ??= _logManager.GetSawmill(Name); + private ISawmill? _sawmill; + public static Color LinkColor => Color.CornflowerBlue; public string Name => "textlink"; @@ -53,7 +58,7 @@ public sealed class TextLinkTag : IMarkupTagHandler if (control.TryGetParentHandler(out var handler)) handler.HandleClick(link); else - Logger.Warning("Warning! No valid ILinkClickHandler found."); + Sawmill.Warning("Warning! No valid ILinkClickHandler found."); } } diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs index 33d31cc52d..3496c92aba 100644 --- a/Content.Client/Launcher/LauncherConnecting.cs +++ b/Content.Client/Launcher/LauncherConnecting.cs @@ -20,7 +20,9 @@ namespace Content.Client.Launcher [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IClipboardManager _clipboard = default!; + [Dependency] private readonly ILogManager _logManager = default!; + private ISawmill _sawmill = default!; private LauncherConnectingGui? _control; private Page _currentPage; @@ -59,6 +61,8 @@ namespace Content.Client.Launcher protected override void Startup() { + _sawmill = _logManager.GetSawmill("launcher-ui"); + _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard); _userInterfaceManager.StateRoot.AddChild(_control); @@ -115,12 +119,12 @@ namespace Content.Client.Launcher } else { - Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address"); + _sawmill.Info($"Redial not possible, no Ss14Address"); } } catch (Exception ex) { - Logger.ErrorS("launcher-ui", $"Redial exception: {ex}"); + _sawmill.Error($"Redial exception: {ex}"); } return false; } diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs index d6a79a81c4..9d62f0c9be 100644 --- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs +++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs @@ -14,12 +14,18 @@ namespace Content.Client.UserInterface.Systems.Alerts.Widgets; [GenerateTypedNameReferences] public sealed partial class AlertsUI : UIWidget { + [Dependency] private readonly ILogManager _logManager = default!; + + private readonly ISawmill _sawmill = default!; + // also known as Control.Children? private readonly Dictionary _alertControls = new(); public AlertsUI() { RobustXamlLoader.Load(this); + + _sawmill = _logManager.GetSawmill("alertsui"); } public void SyncControls(AlertsSystem alertsSystem, @@ -78,15 +84,15 @@ public sealed partial class AlertsUI : UIWidget { if (!alertKey.AlertType.HasValue) { - Logger.WarningS("alert", "found alertkey without alerttype," + - " alert keys should never be stored without an alerttype set: {0}", alertKey); + _sawmill.Warning("found alertkey without alerttype," + + " alert keys should never be stored without an alerttype set: {0}", alertKey); continue; } var alertType = alertKey.AlertType.Value; if (!alertsSystem.TryGet(alertType, out var newAlert)) { - Logger.ErrorS("alert", "Unrecognized alertType {0}", alertType); + _sawmill.Error("Unrecognized alertType {0}", alertType); continue; } diff --git a/Content.Replay/Menu/ReplayMainMenu.cs b/Content.Replay/Menu/ReplayMainMenu.cs index 85c39c59da..5adb769942 100644 --- a/Content.Replay/Menu/ReplayMainMenu.cs +++ b/Content.Replay/Menu/ReplayMainMenu.cs @@ -33,7 +33,9 @@ public sealed class ReplayMainScreen : State [Dependency] private readonly IClientRobustSerializer _serializer = default!; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!; + [Dependency] private readonly ILogManager _logManager = default!; + private ISawmill _sawmill = default!; private ReplayMainMenuControl _mainMenuControl = default!; private SelectReplayWindow? _selectWindow; private ResPath _directory; @@ -42,6 +44,8 @@ public sealed class ReplayMainScreen : State protected override void Startup() { + _sawmill = _logManager.GetSawmill("replay.screen"); + _mainMenuControl = new(_resourceCache); _userInterfaceManager.StateRoot.AddChild(_mainMenuControl); @@ -263,7 +267,7 @@ public sealed class ReplayMainScreen : State } catch (Exception ex) { - Logger.Error($"Failed to load replay info. Exception: {ex}"); + _sawmill.Error($"Failed to load replay info. Exception: {ex}"); SelectReplay(null); return; } diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs index 1c05307c15..0d55ed12bd 100644 --- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs +++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs @@ -112,7 +112,9 @@ public sealed class SpaceHeaterSystem : EntitySystem if (!TryComp(uid, out var thermoMachine)) return; - thermoMachine.TargetTemperature = float.Clamp(thermoMachine.TargetTemperature + args.Temperature, thermoMachine.MinTemperature, thermoMachine.MaxTemperature); + thermoMachine.TargetTemperature = float.Clamp(thermoMachine.TargetTemperature + args.Temperature, + spaceHeater.MinTemperature, + spaceHeater.MaxTemperature); UpdateAppearance(uid); DirtyUI(uid, spaceHeater); diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs deleted file mode 100644 index 004ff24eaf..0000000000 --- a/Content.Server/Body/Components/BrainComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Server.Body.Systems; - -namespace Content.Server.Body.Components -{ - [RegisterComponent, Access(typeof(BrainSystem))] - public sealed partial class BrainComponent : Component - { - } -} diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index c62a10ada3..a37c05336f 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -1,6 +1,3 @@ -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Runtime.InteropServices; using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; using Content.Server.Administration.Systems; @@ -18,6 +15,9 @@ using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Replays; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Runtime.InteropServices; namespace Content.Server.Chat.Managers; @@ -45,6 +45,7 @@ internal sealed partial class ChatManager : IChatManager [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!; [Dependency] private readonly ISharedPlayerManager _player = default!; [Dependency] private readonly DiscordChatLink _discordLink = default!; + [Dependency] private readonly ILogManager _logManager = default!; /// /// The maximum length a player-sent message can be sent @@ -54,6 +55,7 @@ internal sealed partial class ChatManager : IChatManager private bool _oocEnabled = true; private bool _adminOocEnabled = true; + private ISawmill _sawmill = default!; private readonly Dictionary _players = new(); public void Initialize() @@ -64,6 +66,8 @@ internal sealed partial class ChatManager : IChatManager _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true); _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true); + _sawmill = _logManager.GetSawmill("SERVER"); + RegisterRateLimits(); } @@ -111,7 +115,7 @@ internal sealed partial class ChatManager : IChatManager { var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message))); ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride); - Logger.InfoS("SERVER", message); + _sawmill.Info(message); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}"); } diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs index 3913afbd07..ee99418970 100644 --- a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs @@ -19,7 +19,7 @@ public sealed partial class ReactionMixerSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnAfterInteract, before: [typeof(IngestionSystem)]); SubscribeLocalEvent(OnShake); SubscribeLocalEvent(OnDoAfter); } @@ -29,12 +29,13 @@ public sealed partial class ReactionMixerSystem : EntitySystem if (!args.Target.HasValue || !args.CanReach || !entity.Comp.MixOnInteract) return; - if (!MixAttempt(entity, args.Target.Value, out var solution)) + if (!MixAttempt(entity, args.Target.Value, out _)) return; var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.TimeToMix, new ReactionMixDoAfterEvent(), entity, args.Target.Value, entity); _doAfterSystem.TryStartDoAfter(doAfterArgs); + args.Handled = true; } private void OnDoAfter(Entity entity, ref ReactionMixDoAfterEvent args) diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs index a32a2f9495..bfb3d91464 100644 --- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs +++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs @@ -13,11 +13,14 @@ namespace Content.Server.GameTicking.Commands [AnyCommand] sealed class JoinGameCommand : IConsoleCommand { + [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IEntityManager _entManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + private readonly ISawmill _sawmill = default!; + public string Command => "joingame"; public string Description => ""; public string Help => ""; @@ -25,6 +28,8 @@ namespace Content.Server.GameTicking.Commands public JoinGameCommand() { IoCManager.InjectDependencies(this); + + _sawmill = _logManager.GetSawmill("security"); } public void Execute(IConsoleShell shell, string argStr, string[] args) { @@ -46,7 +51,7 @@ namespace Content.Server.GameTicking.Commands if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame) { - Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game."); + _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game."); shell.WriteError($"{player.Name} is not in the lobby. This incident will be reported."); return; } diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs deleted file mode 100644 index e3abc97688..0000000000 --- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Content.Server.Ghost.Components -{ - [RegisterComponent] - public sealed partial class GhostOnMoveComponent : Component - { - [DataField("canReturn")] public bool CanReturn { get; set; } = true; - - [DataField("mustBeDead")] - public bool MustBeDead = false; - } -} diff --git a/Content.Server/NPC/Components/NPCComponent.cs b/Content.Server/NPC/Components/NPCComponent.cs index b1d5bfcf5f..3b396f034e 100644 --- a/Content.Server/NPC/Components/NPCComponent.cs +++ b/Content.Server/NPC/Components/NPCComponent.cs @@ -9,4 +9,5 @@ public abstract partial class NPCComponent : SharedNPCComponent /// [DataField("blackboard", customTypeSerializer: typeof(NPCBlackboardSerializer))] public NPCBlackboard Blackboard = new(); + // TODO FULL GAME SAVE Serialize this } diff --git a/Content.Server/NPC/HTN/HTNComponent.cs b/Content.Server/NPC/HTN/HTNComponent.cs index 43b8a70785..d9b392ab14 100644 --- a/Content.Server/NPC/HTN/HTNComponent.cs +++ b/Content.Server/NPC/HTN/HTNComponent.cs @@ -24,6 +24,7 @@ public sealed partial class HTNComponent : NPCComponent /// [ViewVariables] public HTNPlan? Plan; + // TODO FULL GAME SAVE serialize this? /// /// How long to wait after having planned to try planning again. diff --git a/Content.Server/NPC/HTN/HTNSystem.cs b/Content.Server/NPC/HTN/HTNSystem.cs index 4d9e321dd9..7bfe432998 100644 --- a/Content.Server/NPC/HTN/HTNSystem.cs +++ b/Content.Server/NPC/HTN/HTNSystem.cs @@ -33,6 +33,7 @@ public sealed class HTNSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(_npc.OnMobStateChange); SubscribeLocalEvent(_npc.OnNPCMapInit); + SubscribeLocalEvent(_npc.OnNPCStartup); SubscribeLocalEvent(_npc.OnPlayerNPCAttach); SubscribeLocalEvent(_npc.OnPlayerNPCDetach); SubscribeLocalEvent(OnHTNShutdown); diff --git a/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs new file mode 100644 index 0000000000..d11a99e2b5 --- /dev/null +++ b/Content.Server/NPC/HTN/Preconditions/HasStatusEffectPrecondition.cs @@ -0,0 +1,28 @@ +using Content.Shared.StatusEffectNew; +using Robust.Shared.Prototypes; + +namespace Content.Server.NPC.HTN.Preconditions; + +/// +/// Returns true if entity have specified status effect +/// +public sealed partial class HasStatusEffectPrecondition : HTNPrecondition +{ + private StatusEffectsSystem _statusEffects = default!; + + [DataField(required: true)] + public EntProtoId StatusEffect; + + public override void Initialize(IEntitySystemManager sysManager) + { + base.Initialize(sysManager); + _statusEffects = sysManager.GetEntitySystem(); + } + + public override bool IsMet(NPCBlackboard blackboard) + { + var owner = blackboard.GetValue(NPCBlackboard.Owner); + + return _statusEffects.HasStatusEffect(owner, StatusEffect); + } +} diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs index 27b2a1691d..7aea766930 100644 --- a/Content.Server/NPC/Systems/NPCSystem.cs +++ b/Content.Server/NPC/Systems/NPCSystem.cs @@ -63,9 +63,13 @@ namespace Content.Server.NPC.Systems WakeNPC(uid, component); } - public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args) + public void OnNPCStartup(EntityUid uid, HTNComponent component, ComponentStartup args) { component.Blackboard.SetValue(NPCBlackboard.Owner, uid); + } + + public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args) + { WakeNPC(uid, component); } diff --git a/Content.Shared/Body/Components/BrainComponent.cs b/Content.Shared/Body/Components/BrainComponent.cs new file mode 100644 index 0000000000..be3c3ecbe5 --- /dev/null +++ b/Content.Shared/Body/Components/BrainComponent.cs @@ -0,0 +1,6 @@ +using Content.Shared.Body.Systems; + +namespace Content.Shared.Body.Components; + +[RegisterComponent, Access(typeof(BrainSystem))] +public sealed partial class BrainComponent : Component; diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Shared/Body/Systems/BrainSystem.cs similarity index 92% rename from Content.Server/Body/Systems/BrainSystem.cs rename to Content.Shared/Body/Systems/BrainSystem.cs index e916849a81..55abcbb868 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Shared/Body/Systems/BrainSystem.cs @@ -1,12 +1,12 @@ -using Content.Server.Body.Components; -using Content.Server.Ghost.Components; +using Content.Shared.Body.Components; using Content.Shared.Body.Events; +using Content.Shared.Ghost; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Mobs.Components; using Content.Shared.Pointing; -namespace Content.Server.Body.Systems; +namespace Content.Shared.Body.Systems; public sealed class BrainSystem : EntitySystem { @@ -43,4 +43,3 @@ public sealed class BrainSystem : EntitySystem args.Cancel(); } } - diff --git a/Content.Shared/Ghost/GhostOnMoveComponent.cs b/Content.Shared/Ghost/GhostOnMoveComponent.cs new file mode 100644 index 0000000000..44cb3d0168 --- /dev/null +++ b/Content.Shared/Ghost/GhostOnMoveComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Ghost; + +[RegisterComponent, NetworkedComponent] +public sealed partial class GhostOnMoveComponent : Component +{ + [DataField] + public bool CanReturn = true; + + [DataField] + public bool MustBeDead; +} diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 098f65ef18..5c0c316898 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -205,6 +205,7 @@ namespace Content.Shared.Preferences return new() { Species = species, + Appearance = HumanoidCharacterAppearance.DefaultWithSpecies(species), }; } diff --git a/Content.Shared/Storage/Components/MagnetPickupComponent.cs b/Content.Shared/Storage/Components/MagnetPickupComponent.cs index 90b7e83d63..72a9c81077 100644 --- a/Content.Shared/Storage/Components/MagnetPickupComponent.cs +++ b/Content.Shared/Storage/Components/MagnetPickupComponent.cs @@ -1,15 +1,19 @@ using Content.Shared.Inventory; +using Robust.Shared.GameStates; namespace Content.Shared.Storage.Components; /// /// Applies an ongoing pickup area around the attached entity. /// -[RegisterComponent, AutoGenerateComponentPause] +[RegisterComponent, NetworkedComponent] +[AutoGenerateComponentState] +[AutoGenerateComponentPause] public sealed partial class MagnetPickupComponent : Component { [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")] [AutoPausedField] + [AutoNetworkedField] public TimeSpan NextScan = TimeSpan.Zero; /// diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs index 9a0b48e65b..27a15c87a6 100644 --- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs +++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs @@ -47,6 +47,7 @@ public sealed class MagnetPickupSystem : EntitySystem continue; comp.NextScan += ScanDelay; + Dirty(uid, comp); if (!_inventory.TryGetContainingSlot((uid, xform, meta), out var slotDef)) continue; diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 3ac6c8e461..b2ebdecbfd 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1447,5 +1447,19 @@ Entries: id: 175 time: '2025-09-25T21:43:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40246 +- author: Kowlin + changes: + - message: Adjusted meatspike admin log severities. + type: Tweak + id: 176 + time: '2025-10-03T11:31:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40604 +- author: Kowlin + changes: + - message: Stun prods are now high severity when crafted. + type: Tweak + id: 177 + time: '2025-10-05T07:40:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40709 Name: Admin Order: 2 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c30974ca1f..b308b05667 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,312 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: You can now patch holes in the floors of the evac shuttle and ATS. - type: Fix - id: 8501 - time: '2025-05-17T01:54:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36989 -- author: Lanedon - changes: - - message: Multiple head gear now hides the hair ! - type: Fix - id: 8502 - time: '2025-05-17T05:05:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36818 -- author: ArtisticRoomba - changes: - - message: Metal foam grenades have been added to station engineer lockers. - type: Add - - message: Metal foam grenades have been tweaked to cover more area over a longer - period of time. - type: Tweak - - message: Metal foam grenades now have a 5 second timer. - type: Tweak - - message: Aluminum foam walls now take one hit to destroy. - type: Tweak - id: 8503 - time: '2025-05-17T05:21:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37476 -- author: EmoGarbage404 - changes: - - message: Fixed tetherguns not having a beam when dragging. - type: Fix - id: 8504 - time: '2025-05-17T05:22:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37510 -- author: aada - changes: - - message: Id cards now have the same max length as character names. - type: Fix - id: 8505 - time: '2025-05-17T05:27:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35407 -- author: ArtisticRoomba - changes: - - message: Radiation collector power output has been buffed. Remember engineers, - the third level on the PA is safe for long term use! - type: Tweak - id: 8506 - time: '2025-05-17T07:45:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37475 -- author: Ilya246 - changes: - - message: Shuttles can now deal (weak) collision damage. - type: Add - id: 8507 - time: '2025-05-17T17:11:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37422 -- author: VlaDOS1408 - changes: - - message: Fax UI Menu has been reworked and now behaves better on resizing - type: Tweak - id: 8508 - time: '2025-05-17T17:20:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/33825 -- author: YotaXP - changes: - - message: Favorites selected in the construction menu will now persist between - rounds. - type: Tweak - id: 8509 - time: '2025-05-17T17:37:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35867 -- author: perryprog - changes: - - message: You can now link cutter machines to material silos. - type: Tweak - id: 8510 - time: '2025-05-18T01:51:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37554 -- author: Spangs04 - changes: - - message: Resprited Telecomms - type: Tweak - id: 8511 - time: '2025-05-18T02:10:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35811 -- author: EmoGarbage404 - changes: - - message: Added the salvage job board! This board allows salvagers to access and - complete a variety of jobs in order to rank up, earn spesos, and unlock new - cargo orders. Work hard and you too may become a Supreme Salvager. - type: Add - id: 8512 - time: '2025-05-18T04:02:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37549 -- author: EmoGarbage404 - changes: - - message: Lathes can no longer connect to research servers on separate grids - type: Tweak - id: 8513 - time: '2025-05-18T04:04:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36821 -- author: 0leshe - changes: - - message: Changed max and minimum amount of jigger transfer amount - type: Tweak - id: 8514 - time: '2025-05-18T04:14:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35962 -- author: ArtisticRoomba - changes: - - message: Air grenades have been added! These can fill up a spaced room of ~30 - tiles with fresh air. They can be found in Atmospheric Technician's lockers. - Use them wisely! - type: Add - id: 8515 - time: '2025-05-18T04:32:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37531 -- author: EmoGarbage404 - changes: - - message: Various salvage equipment can now be unlocked through the job board and - purchased through cargo. - type: Add - - message: Space debris and the mining asteroid no longer generate salvage equipment - type: Tweak - id: 8516 - time: '2025-05-18T06:40:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37561 -- author: mrjajkes - changes: - - message: Add Blatantly Nuclear as a Nuke Song. - type: Add - id: 8517 - time: '2025-05-18T07:30:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35927 -- author: metalgearsloth - changes: - - message: Shuttles now are treated as rooved for daylight. - type: Tweak - id: 8518 - time: '2025-05-18T07:47:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36112 -- author: ScarKy0 - changes: - - message: Deliveries can now very rarely spawn as bomb-type! They grant A LOT of - spesos... at a price. - type: Add - id: 8519 - time: '2025-05-18T08:57:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37069 -- author: ScarKy0 - changes: - - message: Aloxadone has been tweaked. The recipe has been altered to be simplier - to make and the healing values have been increased. - type: Tweak - id: 8523 - time: '2025-05-18T09:16:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37239 -- author: Simyon - changes: - - message: The Syndicate and Wizard Communications Console now no longer show who - the message was sent by. - type: Tweak - id: 8524 - time: '2025-05-18T09:18:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37567 -- author: SuperGDPWYL - changes: - - message: A Lone Operative detonating the nuke on-station will now end the round. - type: Add - - message: The endscreen will now properly show how successful Lone Operatives were. - type: Fix - id: 8525 - time: '2025-05-18T11:34:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36498 -- author: metalgearsloth - changes: - - message: Fixes being able to grab items through walls. - type: Fix - id: 8526 - time: '2025-05-18T14:38:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37570 -- author: qwerltaz - changes: - - message: Water vapor is now dangerous to slime life-forms. - type: Add - id: 8527 - time: '2025-05-18T22:55:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32751 -- author: slarticodefast - changes: - - message: Added a new keybind for swapping hands in the other direction (if you - got more than two). Defaults to Shift+X. Useful for cycling through borg modules. - type: Add - id: 8528 - time: '2025-05-19T01:17:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37588 -- author: keronshb - changes: - - message: Force Wall timers changed so it despawns faster than it can be cast. - type: Tweak - - message: Force Wall users can now interact while inside of the wall, but also - can be attacked while inside of the wall. - type: Tweak - id: 8529 - time: '2025-05-19T01:30:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37525 -- author: Samuka - changes: - - message: Holy water now evaporates. - type: Fix - id: 8530 - time: '2025-05-19T16:14:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37611 -- author: aada - changes: - - message: Pepper makes you cough. - type: Add - id: 8531 - time: '2025-05-19T18:23:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36358 -- author: Entvari - changes: - - message: Hyper Capacity Powercells are now available as Tier 3 Industrial Research. - type: Add - - message: The Tier 3 Industrial Research 'Portable Fission' has been renamed to - Optimized Microgalvanism to better reflect this. - type: Tweak - id: 8532 - time: '2025-05-19T22:35:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37619 -- author: RedBookcase - changes: - - message: The Salvage section of the guidebook has been updated. - type: Fix - id: 8533 - time: '2025-05-19T22:39:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37593 -- author: SpeltIncorrectyl - changes: - - message: Kammerer now has a tighter spread to compensate for its lower rate of - fire. - type: Tweak - id: 8534 - time: '2025-05-19T22:45:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37616 -- author: Pronana - changes: - - message: Galoshes now slow on puddles again - type: Fix - id: 8535 - time: '2025-05-20T02:47:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37628 -- author: slarticodefast - changes: - - message: Added a reduced motion version of the seeing rainbows overlay. - type: Add - id: 8536 - time: '2025-05-20T12:36:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37584 -- author: B-Kirill - changes: - - message: Added new fun meteors variations (Cosmic cow, Honksteroid, Space potato) - that drop unique loot upon destruction. Urist McMeteor now shatters into meat - when explodes. - type: Add - id: 8537 - time: '2025-05-20T13:04:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37327 -- author: Kittygyat - changes: - - message: Added a new, faster way for slimepeople to access their own special inventory, - with LMB. - type: Add - id: 8538 - time: '2025-05-20T16:55:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37592 -- author: FrostWinters - changes: - - message: Histamines no longer cause radiation. - type: Tweak - - message: Epinephrine treats Histamines above OD threshold. - type: Tweak - id: 8544 - time: '2025-05-21T01:12:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37460 -- author: Minty642 - changes: - - message: Added fungal soil, maintenance version of hydroponics. - type: Add - id: 8545 - time: '2025-05-21T04:59:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36245 -- author: metalgearsloth - changes: - - message: Picking up items with area pickups (e.g. trash bags) no longer lags the - game. - type: Fix - id: 8546 - time: '2025-05-21T06:16:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37638 -- author: Errant - changes: - - message: High-energy shuttle impacts now deal much less damage. - type: Tweak - id: 8547 - time: '2025-05-21T10:37:36.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37578 - author: metalgearsloth changes: - message: Shuttle impact force is now proportional to direction of impact. @@ -3963,3 +3655,307 @@ id: 9011 time: '2025-09-27T17:01:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/39914 +- author: SignalSender + changes: + - message: reworked salv instrument spawns to include more instruments + type: Tweak + id: 9012 + time: '2025-09-27T20:51:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40572 +- author: keronshb + changes: + - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets + to become prone, are now added into Warden, HoS, and Security locker fills.' + type: Add + id: 9013 + time: '2025-09-27T21:21:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39087 +- author: SurrealShibe + changes: + - message: Vulpkanin now audibly gasp. + type: Fix + id: 9014 + time: '2025-09-28T03:25:39.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40579 +- author: keronshb + changes: + - message: Tasers can now be used by Pacifists. + type: Tweak + id: 9015 + time: '2025-09-28T03:43:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40588 +- author: beck-thompson + changes: + - message: Labelers can no longer add markup tags to items + type: Fix + id: 9016 + time: '2025-09-28T18:33:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40600 +- author: SirWarock + changes: + - message: Fixed Shotgun Ammo Count not properly updating when reloading! + type: Fix + id: 9017 + time: '2025-09-29T10:28:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40568 +- author: BoskiYourk, spanky_spanky + changes: + - message: Microwaves can now be picked up when unwrenched, and optionally, used + as a weapon. + type: Tweak + id: 9018 + time: '2025-09-30T21:55:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40618 +- author: leahcat + changes: + - message: moved desoxyephedrine from ambrosia plants to glasstle. + type: Tweak + id: 9019 + time: '2025-10-01T04:05:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40638 +- author: SignalSender + changes: + - message: Musicians now have a Stage Name + type: Tweak + id: 9020 + time: '2025-10-01T11:46:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40640 +- author: Velcroboy + changes: + - message: Shutters, blast doors, and lights can now be linked using the "Link Defaults" + button. + type: Tweak + id: 9021 + time: '2025-10-01T20:22:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/37690 +- author: YoungThugSS14 + changes: + - message: The Prisoner Eva Suit now has the same stats as an emergency eva suit. + type: Tweak + id: 9022 + time: '2025-10-01T20:23:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/36696 +- author: K-Dynamic + changes: + - message: Puddles now spill over at 50u instead of 20u. + type: Add + id: 9023 + time: '2025-10-01T20:28:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/38044 +- author: Mixelz + changes: + - message: Circuit Totes, a new type of box to compactly carry conspicous chunks + of Circuits! + type: Add + - message: Head Lockers now compact all circuit boards & stamps into boxes for convenience. + type: Tweak + - message: The Surplus Circuit Crate is now a Tote! + type: Tweak + id: 9024 + time: '2025-10-01T23:22:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39868 +- author: sudobeans + changes: + - message: utility knife, which can be made in the autolathe. + type: Add + id: 9025 + time: '2025-10-02T09:02:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39567 +- author: kosticia + changes: + - message: Anomalies with inconsistent particles no longer shuffle right before + collision with particle. + type: Fix + id: 9026 + time: '2025-10-02T20:11:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40624 +- author: archee1 + changes: + - message: Material doors now have destruction sounds and will drop a portion of + their construction materials when destroyed. + type: Add + - message: Material doors now have reduced health, resistances, construction time, + and construction costs + type: Tweak + id: 9027 + time: '2025-10-02T22:47:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/36597 +- author: PJB3005 + changes: + - message: You can stuff the nuke disk in plushies now. + type: Tweak + id: 9028 + time: '2025-10-03T09:53:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40674 +- author: Crude Oil + changes: + - message: Returned PDA lights to original brightness + type: Fix + id: 9029 + time: '2025-10-03T20:33:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40687 +- author: NoreUhh + changes: + - message: The Syndicate Cyborg Martyr Module can now be used multiple times. + type: Tweak + id: 9030 + time: '2025-10-03T23:35:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40224 +- author: K-Dynamic + changes: + - message: Adds smart equip function to pocket 1, pocket 2, and suit storage slots. + Default binds are Shift+F and Shift+G for first and second pocket, Shift+H for + suit storage. + type: Add + id: 9031 + time: '2025-10-04T01:44:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/37975 +- author: AwareFoxy + changes: + - message: Added Pride-O-Mat to marathon! + type: Add + id: 9032 + time: '2025-10-04T16:50:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40696 +- author: Moomoobeef + changes: + - message: Evac directional signs now glow in the dark! + type: Tweak + id: 9033 + time: '2025-10-04T20:27:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/38545 +- author: NoreUhh + changes: + - message: The Ian suit makes you bark now. Woof! + type: Tweak + id: 9034 + time: '2025-10-05T08:06:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40694 +- author: Princess-Cheeseballs + changes: + - message: Incendiary rounds now deal a mix of pierce damage and heat damage instead + of primarily heat damage. + type: Tweak + id: 9035 + time: '2025-10-05T08:38:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39204 +- author: Centronias + changes: + - message: Stirring is once again prioritized over drinking. No longer will your + bartender be very tempted to taste test your drink as they stir it. + type: Fix + id: 9036 + time: '2025-10-05T22:12:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40704 +- author: jessicamaybe + changes: + - message: Skeletons are now playable instruments! + type: Add + id: 9037 + time: '2025-10-07T00:59:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40009 +- author: Huaqas, Davyei + changes: + - message: 3 new Holy Books have been added to the Chaplain's loadout. + type: Add + id: 9038 + time: '2025-10-07T07:39:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39181 +- author: Huaqas + changes: + - message: The Tanakh and Satanic bibles have been removed. + type: Remove + id: 9039 + time: '2025-10-07T09:14:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39698 +- author: jessicamaybe + changes: + - message: Gorillas can now pull objects. + type: Tweak + id: 9040 + time: '2025-10-07T09:31:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40700 +- author: SurrealShibe + changes: + - message: Added the nutri-batard to mime survival boxes in place of the nutri-brick. + type: Add + id: 9041 + time: '2025-10-07T10:18:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40601 +- author: Lordbrandon12 + changes: + - message: Fixed issue allowing space heater temperature to be set above the allowed + limit. + type: Fix + id: 9042 + time: '2025-10-07T12:53:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40453 +- author: IProduceWidgets + changes: + - message: Vox that take excessive amounts of fire damage will now burn into fried + chicken. + type: Tweak + id: 9043 + time: '2025-10-07T14:12:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40115 +- author: BoskiYourk, spanky_spanky + changes: + - message: The Head of Security now has an energy magnum, a self-charging multi-mode + laser revolver, in their locker instead of the energy shotgun. + type: Add + - message: The Warden now has the energy shotgun in their locker round-start. + type: Tweak + id: 9044 + time: '2025-10-07T16:05:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40615 +- author: FungiFellow + changes: + - message: Cancer Mice now have unique ghost role entries. + type: Tweak + id: 9045 + time: '2025-10-07T16:33:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40102 +- author: FungiFellow + changes: + - message: Biosuits can now fit Gastanks in Suit Storage, the Security Biosuit can + fit both Gastanks and Weapons + type: Add + - message: Security Biosuits Cost has been increased 800->1600 + type: Tweak + id: 9046 + time: '2025-10-07T18:22:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39888 +- author: Hitlinemoss + changes: + - message: MRE wrappers are no longer twice as nutritious as the actual food within. + type: Fix + id: 9047 + time: '2025-10-07T19:36:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40761 +- author: TrixxedHeart + changes: + - message: 'Added new markings for Vox: 3 new beak types, 2 beak markings, 1 overlay + 6 head, and 3 chest markings.' + type: Add + - message: Fixed sprite layering issue where a Vox's back leg would appear on top + of their front leg in side sprites. + type: Fix + id: 9048 + time: '2025-10-07T23:14:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40569 +- author: Hitlinemoss + changes: + - message: Bartenders with a significant amount of playtime can now select a golden + shaker in the loadout menu. + type: Add + id: 9049 + time: '2025-10-07T23:37:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40762 +- author: SlamBamActionman + changes: + - message: The Energy Shotgun no longer has a self-recharge or wide fire mode, but + charges faster in rechargers. + type: Tweak + id: 9050 + time: '2025-10-08T02:51:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40757 diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index eba4933919..aa47fbf146 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -731,4 +731,22 @@ id: 88 time: '2025-09-25T21:36:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40546 +- author: Absotively + changes: + - message: Updated Elkridge's burn chambers for safer delta pressure handling + type: Tweak + id: 89 + time: '2025-09-30T03:45:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40590 +- author: ToastEnjoyer + changes: + - message: On Marathon, added various improvements to engineering, parts of maints, + and some service improvements. + type: Tweak + - message: On Marathon, the security front has been fixed so that power is there + roundstart. + type: Fix + id: 90 + time: '2025-10-07T02:21:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40725 Order: 1 diff --git a/Resources/Locale/en-US/discord/round-notifications.ftl b/Resources/Locale/en-US/discord/round-notifications.ftl index a9a3d5fb50..ce5045452b 100644 --- a/Resources/Locale/en-US/discord/round-notifications.ftl +++ b/Resources/Locale/en-US/discord/round-notifications.ftl @@ -1,5 +1,5 @@ discord-round-notifications-new = A new round is starting! discord-round-notifications-started = Round #{$id} on map "{$map}" started. discord-round-notifications-end = Round #{$id} has ended. It lasted for {$hours} hours, {$minutes} minutes, and {$seconds} seconds. -discord-round-notifications-end-ping = <@&{$roleId}>, the server will reboot shortly! +discord-round-notifications-end-ping = <@&{$roleId}>, a new round will start soon! discord-round-notifications-unknown-map = Unknown diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index a578adf82b..6c4ca0c4f4 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -32,6 +32,9 @@ ghost-role-information-silicon-rules = You are a [color={role-type-silicon-color ghost-role-information-mouse-name = Mouse ghost-role-information-mouse-description = A hungry and mischievous mouse. +ghost-role-information-cancer-mouse-name = Cancer Mouse +ghost-role-information-cancer-mouse-description = An irradiated mouse, spread your affliction and seek food. + ghost-role-information-mothroach-name = Mothroach ghost-role-information-mothroach-description = A cute but mischievous mothroach. diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl index 3cb14df2aa..83f073e444 100644 --- a/Resources/Locale/en-US/markings/vox.ftl +++ b/Resources/Locale/en-US/markings/vox.ftl @@ -1,14 +1,62 @@ +marking-TattooVoxNightlingHead-tattoo_nightling_head = Vox Head Tattoo (Nightling) +marking-TattooVoxNightlingHead = Vox Head Tattoo (Nightling) + +marking-TattooVoxArrowHead-tattoo_arrow_head = Vox Head Tattoo (Arrow) +marking-TattooVoxArrowHead = Vox Head Tattoo (Arrow) + +marking-VoxTattooEyeliner-eyeliner = Eyeliner +marking-VoxTattooEyeliner = Eyeliner + +marking-VoxVisage-visage = Visage (Full) +marking-VoxVisage = Visage (Full) + +marking-VoxVisageL-visage_l = Visage (Left) +marking-VoxVisageL = Visage (Left) + +marking-VoxVisageR-visage_r = Visage (Right) +marking-VoxVisageR = Visage (Right) + +marking-VoxCheek-cheekblush = Cheeks +marking-VoxCheek = Cheeks + +marking-VoxBeak-beak = Beak (Pointed) +marking-VoxBeak = Beak (Pointed) + +marking-VoxBeakSquareCere-beak_squarecere = Beak (Square Cere) +marking-VoxBeakSquareCere = Beak (Square Cere) + +marking-VoxBeakHooked-beak_hooked = Beak (Hooked) +marking-VoxBeakHooked = Beak (Hooked) + +marking-VoxBeakShaved-beak_shaved = Beak (Shaved) +marking-VoxBeakShaved = Beak (Shaved) + +marking-VoxBeakCoverTip-beakcover_tip = Beak Tip +marking-VoxBeakCoverTip = Beak Tip + +marking-VoxBeakCoverStripe-beakcover_stripe = Beak Stripe +marking-VoxBeakCoverStripe = Beak Stripe + marking-TattooVoxHeartLeftArm-heart_l_arm = Vox Left Arm Tattoo (Heart) marking-TattooVoxHeartLeftArm = Vox Left Arm Tattoo (Heart) marking-TattooVoxHeartRightArm-heart_r_arm = Vox Right Arm Tattoo (Heart) marking-TattooVoxHeartRightArm = Vox Right Arm Tattoo (Heart) -marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (hive) -marking-TattooVoxHiveChest = Vox Chest Tattoo (hive) +marking-TattooVoxHiveChest-hive_s = Vox Chest Tattoo (Hive) +marking-TattooVoxHiveChest = Vox Chest Tattoo (Hive) -marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (nightling) -marking-TattooVoxNightlingChest = Vox Chest Tattoo (nightling) +marking-TattooVoxNightlingChest-nightling_s = Vox Chest Tattoo (Nightling) +marking-TattooVoxNightlingChest = Vox Chest Tattoo (Nightling) + +marking-TattooVoxNightbelt-nightbelt = Vox Stomach Tattoo (Nightling) +marking-TattooVoxNightbelt = Vox Stomach Tattoo (Nightling) + +marking-TattooVoxChestV-night_v = Vox Chest Tattoo (V Shape) +marking-TattooVoxChestV = Vox Chest Tattoo (V Shape) + +marking-TattooVoxUnderbelly-underbelly = Underbelly +marking-TattooVoxUnderbelly = Underbelly marking-VoxScarEyeRight-vox_scar_eye_right = Right Eye Scar marking-VoxScarEyeRight = Eye Scar (Right) diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index f800aa2c8d..83e2e0c1ac 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -11,7 +11,7 @@ steal-target-groups-captain-id-card = captain ID card steal-target-groups-jetpack-captain-filled = captain's jetpack steal-target-groups-weapon-antique-laser = antique laser pistol steal-target-groups-nuke-disk = nuclear authentication disk -steal-target-groups-weapon-energy-shot-gun = energy shotgun +steal-target-groups-weapon-energy-magnum = energy magnum # Thief Collection steal-target-groups-figurines = figurine diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 077462e73b..452b726ee2 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -43,6 +43,7 @@ loadout-group-passenger-neck = Passenger neck loadout-group-bartender-head = Bartender head loadout-group-bartender-jumpsuit = Bartender jumpsuit loadout-group-bartender-outerclothing = Bartender outer clothing +loadout-group-bartender-shaker = Bartender shaker loadout-group-chef-head = Chef head loadout-group-chef-mask = Chef mask diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 42df78c970..82a4d668c3 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -4,8 +4,8 @@ meta: engineVersion: 267.2.0 forkId: "" forkVersion: "" - time: 10/04/2025 14:51:31 - entityCount: 23828 + time: 10/07/2025 01:59:23 + entityCount: 23873 maps: - 5350 grids: @@ -213,11 +213,11 @@ entities: version: 7 -1,-2: ind: -1,-2 - tiles: HwAAAAACAH4AAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAABEAAAAAAABdAAAAAAAAEQAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAEAEQAAAAAAAF0AAAAAAQARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAwARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAMAcAAAAAAAAH4AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAfgAAAAAAAHAAAAAAAQBwAAAAAAAAcAAAAAAAAHAAAAAAAQB+AAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAAAAH4AAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAgBwAAAAAAEAfgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEAcAAAAAABAHAAAAAAAwBwAAAAAAMAcAAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAACAHAAAAAAAgBwAAAAAAIAcAAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgB+AAAAAAAAfgAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAMAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAA== + tiles: HwAAAAACAH4AAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAABdAAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAABEAAAAAAABdAAAAAAAAEQAAAAAAAF0AAAAAAgARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAgAfAAAAAAMAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAEAEQAAAAAAAF0AAAAAAQARAAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAADABEAAAAAAABdAAAAAAMAEQAAAAAAAF0AAAAAAwARAAAAAAAAXQAAAAAAABEAAAAAAABdAAAAAAIAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAQBsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAADAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAQBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAMAcAAAAAAAAH4AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAfgAAAAAAAHAAAAAAAQBwAAAAAAAAcAAAAAAAAHAAAAAAAQB+AAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAAAAH4AAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAgBwAAAAAAEAfgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAEAcAAAAAABAHAAAAAAAwBwAAAAAAMAcAAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAACAHAAAAAAAgBwAAAAAAIAcAAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgB+AAAAAAAAfgAAAAAAAHAAAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAMAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAA== version: 7 -2,-2: ind: -2,-2 - tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAEAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAH4AAAAAAABwAAAAAAEAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAIAcAAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAAAcAAAAAADAHAAAAAAAABwAAAAAAEADAAAAAABAHAAAAAAAwBwAAAAAAAAcAAAAAABAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAEAcAAAAAABAAwAAAAAAQBwAAAAAAAAcAAAAAADAHAAAAAAAgB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAMAcAAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAQBwAAAAAAEAfgAAAAAAAHAAAAAAAABwAAAAAAIAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAAADAAAAAABAHAAAAAAAQBwAAAAAAAAcAAAAAADAH4AAAAAAABwAAAAAAMAcAAAAAABAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAMAcAAAAAADAAwAAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAgBwAAAAAAIAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAAAcAAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAcAAAAAACAHAAAAAAAwBwAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAAAcAAAAAACAA== + tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB6AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAAAAH4AAAAAAAB6AAAAAAAAegAAAAACAHoAAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAB8AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAEAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAABAH4AAAAAAABwAAAAAAEAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAIAcAAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAAAcAAAAAADAHAAAAAAAABwAAAAAAEADAAAAAABAHAAAAAAAwBwAAAAAAAAcAAAAAABAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAABwAAAAAAEAcAAAAAABAAwAAAAAAQBwAAAAAAAAcAAAAAADAHAAAAAAAgB+AAAAAAAAcAAAAAACAHAAAAAAAgBwAAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAMAcAAAAAAAAHAAAAAAAgBwAAAAAAIAcAAAAAADAHAAAAAAAQBwAAAAAAEAfgAAAAAAAHAAAAAAAABwAAAAAAIAcAAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAcAAAAAABAHAAAAAAAQBwAAAAAAAADAAAAAABAHAAAAAAAQBwAAAAAAAAcAAAAAADAH4AAAAAAABwAAAAAAMAcAAAAAABAHAAAAAAAAB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAMAcAAAAAADAAwAAAAAAABwAAAAAAIAcAAAAAABAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAgBwAAAAAAIAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAABAHAAAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAHAAAAAAAwBwAAAAAAAAcAAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAcAAAAAACAHAAAAAAAwBwAAAAAAMAfgAAAAAAAHAAAAAAAgBwAAAAAAAAcAAAAAACAA== version: 7 -3,-2: ind: -3,-2 @@ -245,7 +245,7 @@ entities: version: 7 -1,-3: ind: -1,-3 - tiles: XQAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgBdAAAAAAIAXQAAAAADAB8AAAAAAwB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAMAHwAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAIAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAADAH4AAAAAAAAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAHwAAAAAAAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAQBdAAAAAAIAHwAAAAACAB8AAAAAAQAfAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAfgAAAAAAAE8AAAAAAAB+AAAAAAAAHwAAAAAAAF0AAAAAAwAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAAAHwAAAAADAH4AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAH4AAAAAAAB+AAAAAAAATwAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAwAfAAAAAAEAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAEAfgAAAAAAAE8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAAAfAAAAAAIAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAADAB8AAAAAAAAfAAAAAAMAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgAfAAAAAAAAHwAAAAADAH4AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAwBdAAAAAAMAHwAAAAACAH4AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAAAfgAAAAAAAA== + tiles: XQAAAAABAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAIAHwAAAAABAB8AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAgBdAAAAAAIAXQAAAAADAB8AAAAAAwB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAXQAAAAADAF0AAAAAAABdAAAAAAMAHwAAAAABAH4AAAAAAABdAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAIAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAIAXQAAAAADAH4AAAAAAAAfAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAIAHwAAAAAAAB8AAAAAAgAfAAAAAAIAHwAAAAACAB8AAAAAAgAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAEAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAQB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAQBdAAAAAAEAXQAAAAABAF0AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAABdAAAAAAEAXQAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAADAF0AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAQBdAAAAAAIAHwAAAAACAB8AAAAAAQAfAAAAAAIAXQAAAAABAF0AAAAAAQBdAAAAAAIAfgAAAAAAAE8AAAAAAAB+AAAAAAAAHwAAAAAAAF0AAAAAAwAfAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAAAHwAAAAADAH4AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAfgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAATwAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAAAAB8AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAwAfAAAAAAEAHwAAAAADAB8AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAE8AAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAAAfAAAAAAIAfgAAAAAAAB8AAAAAAQAfAAAAAAIAHwAAAAADAB8AAAAAAAAfAAAAAAMAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgAfAAAAAAAAHwAAAAADAH4AAAAAAAAfAAAAAAAAHwAAAAACAB8AAAAAAQAfAAAAAAEAHwAAAAACAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAHwAAAAACAH4AAAAAAABdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAA== version: 7 -2,-3: ind: -2,-3 @@ -321,7 +321,7 @@ entities: version: 7 -5,3: ind: -5,3 - tiles: AAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAAAAAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAA== version: 7 -6,2: ind: -6,2 @@ -1105,11 +1105,6 @@ entities: 2601: -13,-19 2629: -29,-16 2674: -12,-9 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteCornerNe - decals: - 2048: -2,-33 - node: color: '#EFB34196' id: BrickTileWhiteCornerNe @@ -1142,11 +1137,6 @@ entities: 2630: -31,-16 2673: -16,-9 3119: -23,-15 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteCornerNw - decals: - 2049: -4,-33 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw @@ -1177,11 +1167,6 @@ entities: 2599: -13,-23 2638: -29,-24 2676: -12,-13 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteCornerSe - decals: - 2050: -2,-36 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe @@ -1212,11 +1197,6 @@ entities: 2600: -19,-23 2637: -31,-24 2675: -16,-13 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteCornerSw - decals: - 2051: -4,-36 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw @@ -1399,12 +1379,6 @@ entities: decals: 2339: 12,21 2340: 12,22 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineE - decals: - 2054: -2,-35 - 2055: -2,-34 - node: color: '#EFB34196' id: BrickTileWhiteLineE @@ -1413,8 +1387,6 @@ entities: 1633: 7,-28 1634: 7,-27 1635: 7,-26 - 2058: -4,-35 - 2059: -4,-34 2441: -40,18 2912: -26,-40 2918: -26,-44 @@ -1464,16 +1436,10 @@ entities: id: BrickTileWhiteLineN decals: 2337: 13,20 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineN - decals: - 2056: -3,-33 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: - 2062: -3,-34 2228: 8,-24 2230: 7,-24 2233: 10,-23 @@ -1535,16 +1501,10 @@ entities: id: BrickTileWhiteLineS decals: 2338: 13,23 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineS - decals: - 2057: -3,-36 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 2063: -3,-35 2229: 8,-25 2438: -43,17 2440: -42,17 @@ -1611,12 +1571,6 @@ entities: decals: 2342: 14,21 2343: 14,22 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineW - decals: - 2052: -4,-35 - 2053: -4,-34 - node: color: '#EFB34196' id: BrickTileWhiteLineW @@ -1627,8 +1581,6 @@ entities: 1639: 5,-26 1640: 5,-25 1643: 9,-26 - 2060: -2,-35 - 2061: -2,-34 2971: 3,-41 - node: color: '#FFFFFFFF' @@ -2477,8 +2429,6 @@ entities: 481: -38,10 636: -1,-34 1003: -19,0 - 2046: -3,-37 - 2047: -3,-32 - node: color: '#EFB34196' id: FullTileOverlayGreyscale @@ -3998,8 +3948,6 @@ entities: 602: -4,-28 603: -4,-29 604: -4,-30 - 605: -4,-31 - 617: -3,-31 618: -2,-31 619: -1,-31 620: 0,-31 @@ -7646,6 +7594,17 @@ entities: - type: Transform pos: -0.39634466,12.638008 parent: 30 +- proto: ActionToggleInternals + entities: + - uid: 9163 + mapInit: true + paused: true + components: + - type: Transform + parent: 23311 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 23311 - proto: AirAlarm entities: - uid: 682 @@ -7926,6 +7885,9 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-35.5 parent: 30 + - type: AccessReader + accessListsOriginal: + - - Atmospherics - type: DeviceList devices: - 14529 @@ -9671,7 +9633,6 @@ entities: - type: DeviceList devices: - 22831 - - 22830 - 11282 - type: Fixtures fixtures: {} @@ -9980,6 +9941,8 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-30.5 parent: 30 + - type: AccessReader + accessListsOriginal: [] - uid: 10017 components: - type: Transform @@ -9998,6 +9961,8 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-30.5 parent: 30 + - type: AccessReader + accessListsOriginal: [] - proto: AirlockAtmosphericsLocked entities: - uid: 8604 @@ -10337,6 +10302,11 @@ entities: - type: Transform pos: -11.5,-46.5 parent: 30 + - uid: 8245 + components: + - type: Transform + pos: -2.5,-36.5 + parent: 30 - uid: 9463 components: - type: MetaData @@ -10404,6 +10374,11 @@ entities: - type: Transform pos: -37.5,25.5 parent: 30 + - uid: 1720 + components: + - type: Transform + pos: -0.5,-33.5 + parent: 30 - uid: 3198 components: - type: Transform @@ -11182,6 +11157,11 @@ entities: - type: Transform pos: -36.5,29.5 parent: 30 + - uid: 1567 + components: + - type: Transform + pos: -32.5,-6.5 + parent: 30 - uid: 1603 components: - type: Transform @@ -11803,7 +11783,7 @@ entities: pos: 34.5,45.5 parent: 30 - type: Door - secondsUntilStateChange: -25686.977 + secondsUntilStateChange: -47726.9 state: Opening - type: DeviceLinkSource lastSignals: @@ -12027,11 +12007,6 @@ entities: - type: Transform pos: -13.5,-17.5 parent: 30 - - uid: 8071 - components: - - type: Transform - pos: -32.5,-6.5 - parent: 30 - proto: AirlockMedicalLocked entities: - uid: 6780 @@ -12270,21 +12245,6 @@ entities: - type: Transform pos: -18.5,-3.5 parent: 30 - - uid: 9163 - components: - - type: Transform - pos: -0.5,-33.5 - parent: 30 - - uid: 9283 - components: - - type: Transform - pos: -2.5,-31.5 - parent: 30 - - uid: 9287 - components: - - type: Transform - pos: -2.5,-36.5 - parent: 30 - uid: 10190 components: - type: Transform @@ -13480,6 +13440,14 @@ entities: parent: 30 - type: Fixtures fixtures: {} + - uid: 9911 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,41.5 + parent: 30 + - type: Fixtures + fixtures: {} - uid: 9934 components: - type: Transform @@ -13694,6 +13662,14 @@ entities: parent: 30 - type: Fixtures fixtures: {} + - uid: 23866 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,47.5 + parent: 30 + - type: Fixtures + fixtures: {} - proto: APCElectronics entities: - uid: 15969 @@ -17330,16 +17306,16 @@ entities: - type: Transform pos: 17.5,-11.5 parent: 30 + - uid: 11252 + components: + - type: Transform + pos: 28.5,13.5 + parent: 30 - uid: 11628 components: - type: Transform pos: 23.5,0.5 parent: 30 - - uid: 12777 - components: - - type: Transform - pos: 25.5,13.5 - parent: 30 - uid: 15246 components: - type: Transform @@ -17493,10 +17469,11 @@ entities: parent: 30 - proto: BedsheetRD entities: - - uid: 12731 + - uid: 23833 components: - type: Transform - pos: 25.5,13.5 + rot: -1.5707963267948966 rad + pos: 28.5,13.5 parent: 30 - proto: BedsheetSpawner entities: @@ -18237,11 +18214,6 @@ entities: - type: Transform pos: -7.4440956,34.21304 parent: 30 - - uid: 11253 - components: - - type: Transform - pos: -3.4874916,-33.356754 - parent: 30 - uid: 11795 components: - type: Transform @@ -30568,12 +30540,12 @@ entities: - uid: 16832 components: - type: Transform - pos: -52.5,45.5 + pos: -53.5,45.5 parent: 30 - uid: 16833 components: - type: Transform - pos: -52.5,44.5 + pos: -53.5,44.5 parent: 30 - uid: 16834 components: @@ -34845,6 +34817,46 @@ entities: - type: Transform pos: -10.5,-66.5 parent: 30 + - uid: 23849 + components: + - type: Transform + pos: -30.5,41.5 + parent: 30 + - uid: 23862 + components: + - type: Transform + pos: -48.5,48.5 + parent: 30 + - uid: 23863 + components: + - type: Transform + pos: -49.5,48.5 + parent: 30 + - uid: 23864 + components: + - type: Transform + pos: -50.5,48.5 + parent: 30 + - uid: 23865 + components: + - type: Transform + pos: -51.5,48.5 + parent: 30 + - uid: 23867 + components: + - type: Transform + pos: -53.5,46.5 + parent: 30 + - uid: 23869 + components: + - type: Transform + pos: -52.5,47.5 + parent: 30 + - uid: 23870 + components: + - type: Transform + pos: -53.5,47.5 + parent: 30 - proto: CableApcStack entities: - uid: 1637 @@ -43683,6 +43695,16 @@ entities: - type: Transform pos: -35.5,-2.5 parent: 30 + - uid: 7870 + components: + - type: Transform + pos: -31.5,44.5 + parent: 30 + - uid: 7881 + components: + - type: Transform + pos: -31.5,43.5 + parent: 30 - uid: 7917 components: - type: Transform @@ -44168,6 +44190,11 @@ entities: - type: Transform pos: -0.5,-39.5 parent: 30 + - uid: 11253 + components: + - type: Transform + pos: -30.5,43.5 + parent: 30 - uid: 11257 components: - type: Transform @@ -47088,6 +47115,21 @@ entities: - type: Transform pos: -24.5,-38.5 parent: 30 + - uid: 23847 + components: + - type: Transform + pos: -30.5,42.5 + parent: 30 + - uid: 23848 + components: + - type: Transform + pos: -30.5,41.5 + parent: 30 + - uid: 23868 + components: + - type: Transform + pos: -52.5,47.5 + parent: 30 - proto: CableMVStack entities: - uid: 1638 @@ -53130,6 +53172,28 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,18.5 parent: 30 + - uid: 23858 + components: + - type: Transform + pos: -31.5,-5.5 + parent: 30 + - uid: 23859 + components: + - type: Transform + pos: -30.5,-5.5 + parent: 30 + - uid: 23860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,-7.5 + parent: 30 + - uid: 23861 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-7.5 + parent: 30 - proto: ChairGreyscale entities: - uid: 904 @@ -53368,12 +53432,6 @@ entities: - type: Transform pos: 13.5,22.5 parent: 30 - - uid: 8245 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-34.5 - parent: 30 - uid: 9060 components: - type: Transform @@ -53391,6 +53449,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-27.5 parent: 30 + - uid: 9287 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.4336228,-32.41538 + parent: 30 - uid: 9407 components: - type: Transform @@ -54075,6 +54139,13 @@ entities: - type: Transform pos: -5.5,-7.5 parent: 30 +- proto: ChemistryBottleMannitol + entities: + - uid: 23852 + components: + - type: Transform + pos: -21.209566,-52.691216 + parent: 30 - proto: ChemistryHotplate entities: - uid: 9180 @@ -55016,19 +55087,6 @@ entities: - type: Transform pos: -15.5,-46.5 parent: 30 - - uid: 11246 - components: - - type: Transform - pos: -1.5,-35.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - Oxygen: 3.4430928 - Nitrogen: 12.952587 - uid: 13346 components: - type: Transform @@ -55187,11 +55245,6 @@ entities: parent: 30 - proto: ClothingEyesGlasses entities: - - uid: 7149 - components: - - type: Transform - pos: -42.51494,-20.530993 - parent: 30 - uid: 8827 components: - type: Transform @@ -55212,39 +55265,13 @@ entities: - type: Transform pos: -23.555922,-31.355957 parent: 30 -- proto: ClothingEyesGlassesGar - entities: - - uid: 7039 - components: - - type: Transform - pos: -41.593063,-21.421618 - parent: 30 - proto: ClothingEyesGlassesGarGiga entities: - - uid: 6805 - components: - - type: Transform - pos: -42.51494,-19.421618 - parent: 30 - uid: 15114 components: - type: Transform pos: 36.506203,30.427496 parent: 30 -- proto: ClothingEyesGlassesGarOrange - entities: - - uid: 7870 - components: - - type: Transform - pos: -40.60869,-21.421618 - parent: 30 -- proto: ClothingEyesGlassesJensen - entities: - - uid: 6989 - components: - - type: Transform - pos: -42.530563,-21.468493 - parent: 30 - proto: ClothingEyesGlassesMeson entities: - uid: 9370 @@ -55257,6 +55284,11 @@ entities: - type: Transform pos: 5.538602,-23.326946 parent: 30 + - uid: 11245 + components: + - type: Transform + pos: -3.4961228,-33.868504 + parent: 30 - uid: 22447 components: - type: Transform @@ -55355,11 +55387,33 @@ entities: - type: Transform pos: -29.37888,29.583 parent: 30 + - uid: 8024 + components: + - type: Transform + pos: -3.4648728,-33.493504 + parent: 30 + - uid: 11426 + components: + - type: Transform + pos: -3.4492478,-33.35288 + parent: 30 - uid: 19401 components: - type: Transform pos: -24.731133,-50.435394 parent: 30 +- proto: ClothingHandsGlovesCombat + entities: + - uid: 9158 + components: + - type: Transform + pos: -8.883268,-35.423473 + parent: 30 + - uid: 9165 + components: + - type: Transform + pos: 9.388684,-26.52471 + parent: 30 - proto: ClothingHandsGlovesFingerless entities: - uid: 15281 @@ -55583,13 +55637,6 @@ entities: - type: Transform pos: -25.477394,-32.340332 parent: 30 -- proto: ClothingHeadHatVioletwizard - entities: - - uid: 19694 - components: - - type: Transform - pos: -21.586058,-27.491894 - parent: 30 - proto: ClothingHeadHatWelding entities: - uid: 1632 @@ -55602,6 +55649,11 @@ entities: - type: Transform pos: -15.49031,-24.471869 parent: 30 + - uid: 11246 + components: + - type: Transform + pos: -3.5195498,-35.314 + parent: 30 - uid: 21731 components: - type: Transform @@ -55765,13 +55817,6 @@ entities: - type: Transform pos: 9.401276,-13.386019 parent: 30 -- proto: ClothingNeckScarfStripedRed - entities: - - uid: 11425 - components: - - type: Transform - pos: -1.4874127,-32.38826 - parent: 30 - proto: ClothingNeckScarfStripedZebra entities: - uid: 664 @@ -56004,20 +56049,6 @@ entities: - type: Transform pos: -9.241632,-47.33087 parent: 30 -- proto: ClothingOuterWinterSec - entities: - - uid: 11426 - components: - - type: Transform - pos: -1.5342877,-32.48201 - parent: 30 -- proto: ClothingOuterWizardViolet - entities: - - uid: 19693 - components: - - type: Transform - pos: -21.523558,-28.023144 - parent: 30 - proto: ClothingShoesBootsJack entities: - uid: 15998 @@ -56083,11 +56114,6 @@ entities: parent: 30 - proto: ClothingShoesWizard entities: - - uid: 19695 - components: - - type: Transform - pos: -21.507933,-28.679394 - parent: 30 - uid: 21672 components: - type: Transform @@ -56120,6 +56146,11 @@ entities: - type: Transform pos: 24.447042,42.46136 parent: 30 + - uid: 23850 + components: + - type: Transform + pos: -21.761425,-52.779373 + parent: 30 - proto: ClothingUniformColorRainbow entities: - uid: 19764 @@ -56920,6 +56951,12 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-45.5 parent: 30 + - uid: 11425 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-32.5 + parent: 30 - uid: 20886 components: - type: Transform @@ -57104,12 +57141,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-1.5 parent: 30 - - uid: 9166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-34.5 - parent: 30 - proto: ComputerTechnologyDiskTerminal entities: - uid: 17885 @@ -64670,6 +64701,11 @@ entities: - type: Transform pos: -34.5,-19.5 parent: 30 + - uid: 11254 + components: + - type: Transform + pos: -5.5,-12.5 + parent: 30 - uid: 19437 components: - type: Transform @@ -65026,10 +65062,10 @@ entities: tags: [] - proto: DrinkTeacup entities: - - uid: 9911 + - uid: 8071 components: - type: Transform - pos: -9.146156,-20.479715 + pos: -9.167248,-20.54054 parent: 30 - uid: 10006 components: @@ -67116,6 +67152,21 @@ entities: parent: 30 - proto: Firelock entities: + - uid: 1721 + components: + - type: Transform + pos: -47.5,38.5 + parent: 30 + - uid: 9156 + components: + - type: Transform + pos: -48.5,45.5 + parent: 30 + - uid: 11247 + components: + - type: Transform + pos: -46.5,45.5 + parent: 30 - uid: 22863 components: - type: Transform @@ -67733,6 +67784,12 @@ entities: - type: DeviceNetwork deviceLists: - 21888 + - uid: 3702 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-31.5 + parent: 30 - uid: 4241 components: - type: Transform @@ -68288,8 +68345,11 @@ entities: - uid: 11282 components: - type: Transform + anchored: False pos: -2.5,-36.5 parent: 30 + - type: Physics + bodyType: Dynamic - type: DeviceNetwork deviceLists: - 22839 @@ -68757,6 +68817,12 @@ entities: - type: DeviceNetwork deviceLists: - 682 + - uid: 23845 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-31.5 + parent: 30 - proto: Fireplace entities: - uid: 4984 @@ -94617,6 +94683,14 @@ entities: - 2333 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4951 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-34.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5029 components: - type: Transform @@ -95773,17 +95847,6 @@ entities: - 22840 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 22830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-34.5 - parent: 30 - - type: DeviceNetwork - deviceLists: - - 22839 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 22842 components: - type: Transform @@ -97707,6 +97770,11 @@ entities: - type: Transform pos: -12.5,-13.5 parent: 30 + - uid: 7149 + components: + - type: Transform + pos: -3.5,-31.5 + parent: 30 - uid: 7215 components: - type: Transform @@ -98262,16 +98330,6 @@ entities: - type: Transform pos: -53.5,35.5 parent: 30 - - uid: 9165 - components: - - type: Transform - pos: -3.5,-31.5 - parent: 30 - - uid: 9167 - components: - - type: Transform - pos: -1.5,-31.5 - parent: 30 - uid: 9185 components: - type: Transform @@ -102842,6 +102900,60 @@ entities: - type: Transform pos: -36.5,62.5 parent: 30 + - uid: 23834 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -74.5,63.5 + parent: 30 + - uid: 23835 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -73.5,63.5 + parent: 30 + - uid: 23836 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -72.5,63.5 + parent: 30 + - uid: 23837 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -71.5,63.5 + parent: 30 + - uid: 23839 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -69.5,63.5 + parent: 30 + - uid: 23840 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -68.5,63.5 + parent: 30 + - uid: 23841 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -67.5,63.5 + parent: 30 + - uid: 23842 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -66.5,63.5 + parent: 30 + - uid: 23843 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,63.5 + parent: 30 - proto: GrilleBroken entities: - uid: 695 @@ -103348,6 +103460,12 @@ entities: rot: 3.141592653589793 rad pos: -60.5,-71.5 parent: 30 + - uid: 23838 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -70.5,63.5 + parent: 30 - proto: GrilleSpawner entities: - uid: 10007 @@ -104474,11 +104592,6 @@ entities: gridUid: 30 - proto: InflatableWallStack entities: - - uid: 9248 - components: - - type: Transform - pos: 9.443903,-26.334238 - parent: 30 - uid: 21276 components: - type: Transform @@ -104640,6 +104753,14 @@ entities: parent: 30 - type: Fixtures fixtures: {} + - uid: 20454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-31.5 + parent: 30 + - type: Fixtures + fixtures: {} - proto: IntercomMedical entities: - uid: 7346 @@ -106461,6 +106582,13 @@ entities: - type: Transform pos: -57.51036,-43.24328 parent: 30 +- proto: LargeBeaker + entities: + - uid: 23853 + components: + - type: Transform + pos: -22.407312,13.26424 + parent: 30 - proto: LauncherCreamPie entities: - uid: 16145 @@ -107284,19 +107412,6 @@ entities: moles: Oxygen: 3.4430928 Nitrogen: 12.952587 - - uid: 11245 - components: - - type: Transform - pos: -1.5,-34.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - Oxygen: 3.4430928 - Nitrogen: 12.952587 - proto: LockerSecurityFilled entities: - uid: 1072 @@ -107724,6 +107839,16 @@ entities: parent: 30 - proto: Matchbox entities: + - uid: 6766 + components: + - type: Transform + pos: -42.446564,-20.600746 + parent: 30 + - uid: 6768 + components: + - type: Transform + pos: -42.634064,-20.350746 + parent: 30 - uid: 17496 components: - type: Transform @@ -108297,8 +108422,16 @@ entities: - uid: 23311 components: - type: Transform - pos: 4.278227,-46.40056 + pos: 4.3357787,-46.395798 parent: 30 + - type: GasTank + toggleActionEntity: 9163 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 9163 - proto: NitrousOxideCanister entities: - uid: 7289 @@ -108504,11 +108637,6 @@ entities: - type: Transform pos: -9.625428,-38.389084 parent: 30 - - uid: 9061 - components: - - type: Transform - pos: 4.148211,-46.341225 - parent: 30 - uid: 9659 components: - type: Transform @@ -109024,16 +109152,6 @@ entities: parent: 30 - proto: PartRodMetal1 entities: - - uid: 7881 - components: - - type: Transform - pos: -41.20244,-21.437243 - parent: 30 - - uid: 8024 - components: - - type: Transform - pos: -41.20244,-21.437243 - parent: 30 - uid: 19677 components: - type: Transform @@ -109129,11 +109247,6 @@ entities: - type: Transform pos: -31.123026,-0.3196025 parent: 30 - - uid: 11254 - components: - - type: Transform - pos: -3.3156166,-32.950504 - parent: 30 - uid: 11632 components: - type: Transform @@ -109422,6 +109535,24 @@ entities: parent: 30 - type: DeltaPressure gridUid: 30 +- proto: PlasmaWindowDirectional + entities: + - uid: 7039 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,40.5 + parent: 30 + - type: DeltaPressure + gridUid: 30 + - uid: 19695 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,41.5 + parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: PlasticFlapsAirtightClear entities: - uid: 11228 @@ -109493,6 +109624,13 @@ entities: - type: Transform pos: -84.53038,-45.378 parent: 30 +- proto: PlushieHampter + entities: + - uid: 23854 + components: + - type: Transform + pos: 16.566488,-14.522018 + parent: 30 - proto: PlushieLizard entities: - uid: 15217 @@ -109545,6 +109683,13 @@ entities: - type: Transform pos: 40.559143,-53.538166 parent: 30 +- proto: PlushieVox + entities: + - uid: 23851 + components: + - type: Transform + pos: -21.51841,-52.3398 + parent: 30 - proto: PortableFlasher entities: - uid: 2719 @@ -109574,11 +109719,6 @@ entities: - type: Transform pos: 23.5,4.5 parent: 30 - - uid: 19442 - components: - - type: Transform - pos: -23.5,-28.5 - parent: 30 - uid: 19476 components: - type: Transform @@ -109604,6 +109744,11 @@ entities: - type: Transform pos: -59.5,36.5 parent: 30 + - uid: 19694 + components: + - type: Transform + pos: -21.5,-28.5 + parent: 30 - proto: PortableGeneratorPacman entities: - uid: 10534 @@ -110347,13 +110492,6 @@ entities: - type: Transform pos: -17.5,36.5 parent: 30 -- proto: PottedPlant2 - entities: - - uid: 8371 - components: - - type: Transform - pos: 3.5092015,-30.805378 - parent: 30 - proto: PottedPlant21 entities: - uid: 1566 @@ -110571,14 +110709,6 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} - - uid: 1722 - components: - - type: Transform - pos: -30.5,42.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - uid: 2124 components: - type: Transform @@ -110645,14 +110775,6 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} - - uid: 9162 - components: - - type: Transform - pos: -1.5,-30.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - uid: 11068 components: - type: Transform @@ -110884,6 +111006,11 @@ entities: parent: 30 - type: Physics canCollide: False + - uid: 1722 + components: + - type: Transform + pos: -1.5,-31.5 + parent: 30 - uid: 2004 components: - type: Transform @@ -111050,6 +111177,22 @@ entities: rot: 3.141592653589793 rad pos: 42.5,43.5 parent: 30 + - uid: 23871 + components: + - type: Transform + pos: -51.5,45.5 + parent: 30 + - uid: 23872 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,46.5 + parent: 30 + - uid: 23873 + components: + - type: Transform + pos: -56.5,41.5 + parent: 30 - proto: Poweredlight entities: - uid: 98 @@ -114822,11 +114965,6 @@ entities: - type: Transform pos: -9.5,-41.5 parent: 30 - - uid: 11255 - components: - - type: Transform - pos: -3.5,-35.5 - parent: 30 - uid: 11421 components: - type: Transform @@ -116085,11 +116223,6 @@ entities: - type: Transform pos: 7.5,29.5 parent: 30 - - uid: 3702 - components: - - type: Transform - pos: -3.5,-30.5 - parent: 30 - uid: 3704 components: - type: Transform @@ -118788,20 +118921,6 @@ entities: parent: 30 - type: DeltaPressure gridUid: 30 - - uid: 9156 - components: - - type: Transform - pos: -1.5,-31.5 - parent: 30 - - type: DeltaPressure - gridUid: 30 - - uid: 9158 - components: - - type: Transform - pos: -3.5,-31.5 - parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9234 components: - type: Transform @@ -119222,6 +119341,13 @@ entities: parent: 30 - type: DeltaPressure gridUid: 30 + - uid: 11256 + components: + - type: Transform + pos: -3.5,-31.5 + parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11270 components: - type: Transform @@ -121653,11 +121779,6 @@ entities: - type: Transform pos: -4.5072117,-10.071463 parent: 30 - - uid: 7217 - components: - - type: Transform - pos: -42.32744,-20.937243 - parent: 30 - uid: 18172 components: - type: Transform @@ -121693,6 +121814,23 @@ entities: - type: Transform pos: -76.5,-51.5 parent: 30 +- proto: ShardGlass + entities: + - uid: 6989 + components: + - type: Transform + pos: -40.321564,-21.272621 + parent: 30 + - uid: 9166 + components: + - type: Transform + pos: -40.80594,-21.319496 + parent: 30 + - uid: 11250 + components: + - type: Transform + pos: -40.634064,-21.538246 + parent: 30 - proto: SheetGlass entities: - uid: 5635 @@ -121743,7 +121881,7 @@ entities: - uid: 22523 components: - type: Transform - pos: 3.361289,-46.49021 + pos: 3.1795287,-46.489548 parent: 30 - proto: SheetPlasma entities: @@ -121908,6 +122046,11 @@ entities: - type: Transform pos: -38.50112,-3.4785028 parent: 30 + - uid: 6805 + components: + - type: Transform + pos: -40.446564,-18.397621 + parent: 30 - uid: 9678 components: - type: Transform @@ -122015,6 +122158,13 @@ entities: - type: Transform pos: -15.342251,-37.568897 parent: 30 +- proto: Shiv + entities: + - uid: 6767 + components: + - type: Transform + pos: -41.290314,-21.444496 + parent: 30 - proto: Shovel entities: - uid: 12092 @@ -125369,6 +125519,13 @@ entities: - type: Transform pos: 3.5163379,42.700695 parent: 30 +- proto: SmallLight + entities: + - uid: 10040 + components: + - type: Transform + pos: -24.5,-30.5 + parent: 30 - proto: SmartFridge entities: - uid: 315 @@ -125509,7 +125666,7 @@ entities: - uid: 16235 components: - type: Transform - pos: 48.50878,41.513634 + pos: 48.418343,41.43319 parent: 30 - proto: SodaDispenser entities: @@ -126898,10 +127055,27 @@ entities: parent: 30 - proto: SpawnMobBandito entities: - - uid: 12828 + - uid: 23832 components: - type: Transform - pos: 26.5,13.5 + pos: 29.5,15.5 + parent: 30 +- proto: SpawnMobButterfly + entities: + - uid: 23855 + components: + - type: Transform + pos: -11.5,23.5 + parent: 30 + - uid: 23856 + components: + - type: Transform + pos: -6.5,23.5 + parent: 30 + - uid: 23857 + components: + - type: Transform + pos: -8.5,23.5 parent: 30 - proto: SpawnMobCat entities: @@ -127025,10 +127199,10 @@ entities: parent: 30 - proto: SpawnMobWalter entities: - - uid: 6768 + - uid: 11255 components: - type: Transform - pos: -8.5,-9.5 + pos: -5.5,-12.5 parent: 30 - proto: SpawnPointAtmos entities: @@ -127128,15 +127302,15 @@ entities: parent: 30 - proto: SpawnPointChemist entities: - - uid: 6766 + - uid: 23844 components: - type: Transform - pos: -7.5,-9.5 + pos: -8.5,-6.5 parent: 30 - - uid: 6767 + - uid: 23846 components: - type: Transform - pos: -6.5,-9.5 + pos: -6.5,-6.5 parent: 30 - proto: SpawnPointChiefEngineer entities: @@ -127666,7 +127840,7 @@ entities: - uid: 9326 components: - type: Transform - pos: 9.666185,-26.444672 + pos: 9.748059,-26.43096 parent: 30 - uid: 23318 components: @@ -127727,6 +127901,14 @@ entities: - type: Transform pos: -16.5,-16.5 parent: 30 +- proto: StationAiFixerComputer + entities: + - uid: 1733 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,13.5 + parent: 30 - proto: StationAiUploadComputer entities: - uid: 22212 @@ -131024,6 +131206,11 @@ entities: - type: Transform pos: -18.5,-18.5 parent: 30 + - uid: 9167 + components: + - type: Transform + pos: -40.5,-18.5 + parent: 30 - uid: 9168 components: - type: Transform @@ -131099,21 +131286,6 @@ entities: - type: Transform pos: -8.5,-47.5 parent: 30 - - uid: 11247 - components: - - type: Transform - pos: -1.5,-32.5 - parent: 30 - - uid: 11249 - components: - - type: Transform - pos: -3.5,-32.5 - parent: 30 - - uid: 11250 - components: - - type: Transform - pos: -3.5,-33.5 - parent: 30 - uid: 11336 components: - type: Transform @@ -132052,6 +132224,12 @@ entities: - type: Transform pos: -10.5,-8.5 parent: 30 + - uid: 4950 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-35.5 + parent: 30 - uid: 5353 components: - type: Transform @@ -132207,6 +132385,17 @@ entities: - type: Transform pos: 3.5,-46.5 parent: 30 + - uid: 9061 + components: + - type: Transform + pos: -2.5,-31.5 + parent: 30 + - uid: 9248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-34.5 + parent: 30 - uid: 9658 components: - type: Transform @@ -132277,6 +132466,11 @@ entities: - type: Transform pos: 4.5,-27.5 parent: 30 + - uid: 11249 + components: + - type: Transform + pos: -1.5,-31.5 + parent: 30 - uid: 11821 components: - type: Transform @@ -132302,6 +132496,12 @@ entities: - type: Transform pos: -7.5,-35.5 parent: 30 + - uid: 22830 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-33.5 + parent: 30 - proto: TableReinforcedGlass entities: - uid: 2113 @@ -133435,6 +133635,11 @@ entities: - type: Transform pos: -32.56638,31.48925 parent: 30 + - uid: 12731 + components: + - type: Transform + pos: -3.4804978,-34.337254 + parent: 30 - uid: 19180 components: - type: Transform @@ -133477,11 +133682,6 @@ entities: - type: Transform pos: -11.488707,-33.250866 parent: 30 - - uid: 11256 - components: - - type: Transform - pos: -3.5175757,-35.433304 - parent: 30 - uid: 15271 components: - type: Transform @@ -133506,6 +133706,11 @@ entities: - type: Transform pos: -24.487177,31.504875 parent: 30 + - uid: 7217 + components: + - type: Transform + pos: -3.4961228,-34.82291 + parent: 30 - uid: 11271 components: - type: Transform @@ -134341,6 +134546,11 @@ entities: - type: Transform pos: -21.5,-46.5 parent: 30 + - uid: 23831 + components: + - type: Transform + pos: -1.5,-35.5 + parent: 30 - proto: VendingMachineEngivend entities: - uid: 9291 @@ -140369,6 +140579,12 @@ entities: - type: Transform pos: 30.5,17.5 parent: 30 + - uid: 12777 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,28.5 + parent: 30 - uid: 12781 components: - type: Transform @@ -140399,6 +140615,12 @@ entities: - type: Transform pos: -39.5,-35.5 parent: 30 + - uid: 12828 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,38.5 + parent: 30 - uid: 12846 components: - type: Transform @@ -142234,6 +142456,30 @@ entities: - type: Transform pos: 12.5,40.5 parent: 30 + - uid: 19442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,40.5 + parent: 30 + - uid: 19683 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,40.5 + parent: 30 + - uid: 19684 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,40.5 + parent: 30 + - uid: 19693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,40.5 + parent: 30 - uid: 19784 components: - type: Transform @@ -145061,11 +145307,6 @@ entities: - type: Transform pos: -58.5,32.5 parent: 30 - - uid: 1567 - components: - - type: Transform - pos: -23.5,28.5 - parent: 30 - uid: 1579 components: - type: Transform @@ -145131,21 +145372,6 @@ entities: - type: Transform pos: -27.5,38.5 parent: 30 - - uid: 1720 - components: - - type: Transform - pos: -25.5,38.5 - parent: 30 - - uid: 1721 - components: - - type: Transform - pos: -25.5,40.5 - parent: 30 - - uid: 1733 - components: - - type: Transform - pos: -26.5,40.5 - parent: 30 - uid: 1816 components: - type: Transform @@ -145271,16 +145497,6 @@ entities: - type: Transform pos: 1.5,-5.5 parent: 30 - - uid: 4950 - components: - - type: Transform - pos: -27.5,40.5 - parent: 30 - - uid: 4951 - components: - - type: Transform - pos: -28.5,40.5 - parent: 30 - uid: 4980 components: - type: Transform @@ -148656,16 +148872,6 @@ entities: - type: Transform pos: -20.5,-26.5 parent: 30 - - uid: 19683 - components: - - type: Transform - pos: -22.5,-27.5 - parent: 30 - - uid: 19684 - components: - - type: Transform - pos: -22.5,-28.5 - parent: 30 - uid: 19814 components: - type: Transform @@ -149347,6 +149553,11 @@ entities: - type: Transform pos: -28.5,48.5 parent: 30 + - uid: 8371 + components: + - type: Transform + pos: 3.5,-30.5 + parent: 30 - uid: 11611 components: - type: Transform @@ -149367,11 +149578,6 @@ entities: - type: Transform pos: 7.5,32.5 parent: 30 - - uid: 20454 - components: - - type: Transform - pos: -0.5,-30.5 - parent: 30 - uid: 20455 components: - type: Transform @@ -149404,6 +149610,11 @@ entities: - type: Transform pos: -50.5,69.5 parent: 30 + - uid: 9283 + components: + - type: Transform + pos: -21.5,-27.5 + parent: 30 - uid: 14476 components: - type: Transform @@ -149516,13 +149727,6 @@ entities: parent: 30 - type: Physics canCollide: False - - uid: 11252 - components: - - type: Transform - pos: -3.5,-32.5 - parent: 30 - - type: Physics - canCollide: False - uid: 20998 components: - type: Transform @@ -150094,6 +150298,20 @@ entities: gridUid: 30 - proto: WindoorSecureEngineeringLocked entities: + - uid: 6455 + components: + - type: Transform + pos: -1.5,-31.5 + parent: 30 + - type: DeltaPressure + gridUid: 30 + - uid: 9162 + components: + - type: Transform + pos: -2.5,-31.5 + parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21294 components: - type: Transform diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 9ff3488a43..9b5c0ddad6 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -54,7 +54,7 @@ sprite: Clothing/Head/Hoods/Bio/security.rsi state: icon product: CrateSecurityBiosuit - cost: 800 + cost: 1600 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 972eb5074b..29f561c1b8 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -183,6 +183,7 @@ - id: DrinkWaterBottleFull - type: Tag tags: + - BoxCardboard - BoxHug - type: entity @@ -212,7 +213,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull - type: entity @@ -226,7 +227,7 @@ - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull - type: Sprite layers: @@ -246,7 +247,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick + - id: FoodBreadCottonNutriBatard - id: DrinkWaterBottleFull - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 257dd2ea5e..6c789a8f59 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -408,7 +408,7 @@ - type: Storage grid: - 0,0,5,3 - whitelist: + whitelist: # TODO cardboard boxes shouldn't have whitelisting tags: - Candle - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 7f3a16c33a..53d8a00e1d 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -102,7 +102,7 @@ layers: - state: box - state: bodybags - - type: Storage + - type: Storage # TODO cardboard boxes shouldn't have whitelisting whitelist: tags: - BodyBag diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index cf5297220c..2b4c5c9b36 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -308,7 +308,7 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: WeaponEnergyShotgun + - id: WeaponEnergyMagnum - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index a6add7f4b7..48bed23bc9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -46,6 +46,7 @@ amount: 2 - id: NetworkConfigurator - id: Binoculars + - id: WeaponEnergyShotgun - type: entityTable id: FillLockerWardenHarduit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index 4da176e2ed..eb5827e013 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterBaseLarge + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothingGasTanks] id: ClothingOuterBioGeneral name: bio suit suffix: Generic @@ -64,7 +64,7 @@ sprite: Clothing/OuterClothing/Bio/scientist.rsi - type: entity - parent: [ClothingOuterBioGeneral, BaseSecurityContraband] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] id: ClothingOuterBioSecurity name: bio suit suffix: Security @@ -82,7 +82,11 @@ Piercing: 0.8 - type: ZombificationResistance zombificationResistanceCoefficient: 0.4 - + - type: GroupExamine + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: entity parent: ClothingOuterBioGeneral id: ClothingOuterBioVirology diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml index 0643c5cbd4..ccf1a687b8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml @@ -13,6 +13,52 @@ !type:SimpleColoring color: "#937e3d" +- type: marking + # The cere is the base of the top part of the beak, the cere on this beak, is a square. + id: VoxBeakSquareCere + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_squarecere + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + +- type: marking + id: VoxBeakShaved + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_shaved + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + +- type: marking + id: VoxBeakHooked + bodyPart: Snout + markingCategory: Snout + forcedColoring: true + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: beak_hooked + coloring: + default: + type: + !type:SimpleColoring + color: "#937e3d" + - type: marking id: VoxLArmScales bodyPart: LArm diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml index cf350da60d..75d2503528 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml @@ -54,6 +54,50 @@ - sprite: Mobs/Customization/vox_tattoos.rsi state: nightling_s +- type: marking + id: TattooVoxNightbelt + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: nightbelt + +- type: marking + id: TattooVoxChestV + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: chest_v_1 + - sprite: Mobs/Customization/vox_tattoos.rsi + state: chest_v_2 + +- type: marking + id: TattooVoxUnderbelly + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: underbelly + - type: marking id: TattooVoxTailRing # TODO // Looks off on some tails (i.e docked/amputated), if conditionals for markings ever get implemented this needs to be updated to account for those. @@ -130,4 +174,126 @@ forcedColoring: true sprites: - sprite: Mobs/Customization/vox_tattoos.rsi - state: eyeshadow_large \ No newline at end of file + state: eyeshadow_large + +- type: marking + id: VoxTattooEyeliner + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: eyeliner + +- type: marking + id: VoxBeakCoverStripe + bodyPart: Snout + markingCategory: SnoutCover + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: beakcover_stripe + +- type: marking + id: VoxBeakCoverTip + bodyPart: Snout + markingCategory: SnoutCover + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: beakcover_tip + +- type: marking + id: TattooVoxArrowHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_arrow_head + +- type: marking + id: TattooVoxNightlingHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tattoo_nightling_head + +- type: marking + id: VoxVisage + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage + +- type: marking + id: VoxVisageL + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage_l + +- type: marking + id: VoxVisageR + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: visage_r + +- type: marking + id: VoxCheek + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: cheekblush + diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e6b761d515..c812140812 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1215,6 +1215,8 @@ true NavSmash: !type:Bool true + - type: Puller + needsHands: false - type: Prying pryPowered: true force: true @@ -1978,6 +1980,12 @@ parent: MobMouse id: MobMouseCancer components: + - type: GhostRole + name: ghost-role-information-cancer-mouse-name + description: ghost-role-information-cancer-mouse-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent - type: Sprite color: LightGreen - type: PointLight diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index cb0cfdb693..08bdbe8ebb 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -76,7 +76,7 @@ components: - type: Spectral - type: Tag - tags: + tags: # BAD: Intentional removal of inherited tag - AllowGhostShownByEvent - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 229c2da027..5dc127878f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -109,6 +109,24 @@ 32: sprite: Mobs/Species/Human/displacement.rsi state: jumpsuit-female + - type: Instrument + program: 13 # Xylophone. Woodblock is 115 (another good option) + - type: ActivatableUI + blockSpectators: true # otherwise they can play client-side music + inHandsOnly: false + singleUser: true + requiresComplex: true + verbOnly: true + verbText: verb-instrument-openui + key: enum.InstrumentUiKey.Key + - type: UserInterface + interfaces: + enum.InstrumentUiKey.Key: + type: InstrumentBoundUserInterface + enum.HumanoidMarkingModifierKey.Key: + type: HumanoidMarkingModifierBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index b49d0fb409..44687ac544 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -30,6 +30,44 @@ - type: Damageable damageContainer: Biological damageModifierSet: Vox + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Blunt + damage: 400 + behaviors: + - !type:GibBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 1500 + behaviors: + - !type:SpawnEntitiesBehavior + spawnInContainer: true + spawn: + FoodMeatChickenFriedVox: + min: 3 + max: 5 + - !type:BurnBodyBehavior { } + - !type:PlaySoundBehavior + sound: + collection: MeatLaserImpact + - trigger: + !type:DamageTypeTrigger + damageType: Radiation + damage: 15 + behaviors: + - !type:PopupBehavior + popup: mouth-taste-metal + popupType: LargeCaution + targetOnly: true + - trigger: + !type:DamageTypeTrigger + damageType: Radiation + damage: 40 + behaviors: + - !type:VomitBehavior - type: PassiveDamage # Augment normal health regen to be able to tank some Poison damage # This allows Vox to take their mask off temporarily to eat something without needing a trip to medbay afterwards. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml index c4e8b020e7..14e4b741c5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml @@ -91,7 +91,7 @@ # map: ["enum.OpenableVisuals.Layer"] ## Bases for visuals -# TODO standardize state names for fill levels and openable visuals +# New drinks should mirror these state names to reduce clutter when creating new prototypes # Basic visualizer for an openable entity. Requires DrinkBaseOpenable - type: entity @@ -103,13 +103,14 @@ visuals: enum.OpenableVisuals.Opened: enum.OpenableVisuals.Layer: - True: {state: "icon_open"} - False: {state: "icon"} + True: {state: "icon_open"} # lid off + False: {state: "icon"} # lid on - type: Sprite layers: - state: icon map: ["enum.OpenableVisuals.Layer"] - type: ExaminableSolution + solution: *sol examinableWhileClosed: false # If you can't see the fill levels on the sprite, we can assume it's opaque heldOnly: true # If it's opaque, you probably can't see through the open lid from a distance @@ -121,11 +122,12 @@ - type: Appearance - type: Sprite layers: - - state: icon_empty + - state: icon - state: fill-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: SolutionContainerVisuals + solutionName: *sol maxFillLevels: 5 fillBaseName: fill- inHandsMaxFillLevels: 3 @@ -139,7 +141,7 @@ components: - type: Sprite layers: - - state: icon_empty + - state: icon map: [ "enum.SolutionContainerLayers.Base" ] - state: fill-1 map: [ "enum.SolutionContainerLayers.Fill" ] @@ -169,8 +171,8 @@ visuals: enum.OpenableVisuals.Opened: enum.OpenableVisuals.Layer: - True: {state: "icon_open"} - False: {state: "icon_empty"} + True: {state: "icon_open"} # lid off + False: {state: "icon_empty"} # lid on - type: Sprite layers: - state: icon_empty diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml index ec6bdf8002..3aa1e1d547 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml @@ -106,7 +106,7 @@ - type: Sprite sprite: Objects/Consumable/Drinks/alco-bottle.rsi layers: - - state: icon_blue # todo add "icon_empty" state + - state: icon_empty map: ["enum.OpenableVisuals.Layer"] - state: fill-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -260,7 +260,7 @@ - type: Sprite sprite: Objects/Consumable/Drinks/alco-bottle.rsi layers: - - state: icon_green # todo icon_empty + - state: icon_empty map: ["enum.OpenableVisuals.Layer"] - state: fill-6 map: ["enum.SolutionContainerLayers.Fill"] diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 3102ffc522..bb3eb76c29 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -9,7 +9,7 @@ solutions: drink: maxVol: 30 - grindable: + grindable: &grindable reagents: # 5u -> 1/2 steel sheet (10u) - ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron. Quantity: 4 @@ -51,12 +51,7 @@ reagents: - ReagentId: Cola Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Tag tags: - Cola @@ -76,12 +71,7 @@ solutions: drink: maxVol: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Tag tags: - Cola @@ -101,12 +91,7 @@ reagents: - ReagentId: IcedTea Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/ice_tea_can.rsi - type: Item @@ -125,12 +110,7 @@ reagents: - ReagentId: LemonLime Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/lemon-lime.rsi - type: Item @@ -149,12 +129,7 @@ reagents: - ReagentId: LemonLimeCranberry Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi - type: Item @@ -206,12 +181,7 @@ reagents: - ReagentId: GrapeSoda Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/purple_can.rsi - type: Item @@ -230,12 +200,7 @@ reagents: - ReagentId: RootBeer Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/rootbeer.rsi - type: Item @@ -258,12 +223,7 @@ reagents: - ReagentId: SodaWater Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/sodawater.rsi - type: Item @@ -282,12 +242,7 @@ reagents: - ReagentId: SpaceMountainWind Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi - type: Item @@ -306,12 +261,7 @@ reagents: - ReagentId: SpaceUp Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/space-up.rsi - type: Item @@ -330,12 +280,7 @@ reagents: - ReagentId: SolDry Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/sol_dry.rsi - type: Item @@ -354,12 +299,7 @@ reagents: - ReagentId: Starkist Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/starkist.rsi - type: Item @@ -378,12 +318,7 @@ reagents: - ReagentId: TonicWater Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/tonic.rsi - type: Item @@ -402,12 +337,7 @@ reagents: - ReagentId: FourteenLoko Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/fourteen_loko.rsi - type: Item @@ -426,12 +356,7 @@ reagents: - ReagentId: ChangelingSting Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/changelingsting.rsi - type: Item @@ -450,12 +375,7 @@ reagents: - ReagentId: DrGibb Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/dr_gibb.rsi - type: Item @@ -478,12 +398,7 @@ Quantity: 20 - ReagentId: Ice Quantity: 5 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/robustnukie.rsi - type: Item @@ -502,12 +417,7 @@ reagents: - ReagentId: EnergyDrink Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/energy_drink.rsi - type: Item @@ -526,12 +436,7 @@ reagents: - ReagentId: ShamblersJuice Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/shamblersjuice.rsi - type: Item @@ -550,12 +455,7 @@ reagents: - ReagentId: PwrGame Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/pwrgame.rsi - type: Item @@ -574,12 +474,7 @@ reagents: - ReagentId: Beer Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/beer_can.rsi - type: Item @@ -602,12 +497,7 @@ reagents: - ReagentId: Wine Quantity: 30 - grindable: - reagents: - - ReagentId: Aluminium - Quantity: 4 - - ReagentId: Iron - Quantity: 1 + grindable: *grindable - type: Sprite sprite: Objects/Consumable/Drinks/wine_can.rsi - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index e1fe78c433..7b1320ba49 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -22,22 +22,16 @@ # A mug is a type of cup.[2] - type: entity abstract: true - parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup ] # todo Should use DrinkVisualsFill, but inheritors have no in-hand and state names are wrong + parent: [ DrinkBaseMaterialPorcelain, DrinkBaseCup, DrinkVisualsFill ] id: DrinkBaseMug name: mug description: A mug. components: - type: Sprite sprite: Objects/Consumable/Drinks/mug.rsi - layers: - - state: icon-0 - - state: icon-3 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 3 - fillBaseName: icon- + inHandsFillBaseName: null ## Misc Cups @@ -53,18 +47,13 @@ price: 125 - type: entity - parent: DrinkBaseMug + parent: DrinkBaseMug # a teacup is basically a mug id: DrinkTeacupEmpty name: teacup description: A plain white porcelain teacup. components: - type: Sprite sprite: Objects/Consumable/Drinks/teacup.rsi - layers: - - state: icon-0 - - state: icon-4 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - type: SolutionContainerVisuals maxFillLevels: 4 @@ -76,20 +65,11 @@ components: - type: Sprite sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi - layers: - - state: icon # todo add "icon_empty" state to match DrinkVisualsFillOverlay - map: [ "enum.SolutionContainerLayers.Base" ] - - state: fill1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - state: icon-front - map: [ "enum.SolutionContainerLayers.Overlay" ] - type: SolutionContainerVisuals - fillBaseName: fill # todo rename to "fill-" to match DrinkVisualsFillOverlay inHandsMaxFillLevels: 1 - type: entity - parent: [DrinkBaseMaterialCardboard, DrinkBaseCup] # TODO should use DrinkVisualsFill but state names are wrong and no inhand + parent: [DrinkBaseMaterialCardboard, DrinkBaseCup, DrinkBaseEmptyTrash, DrinkVisualsFill] id: DrinkWaterCup name: water cup description: A paper water cup. @@ -102,22 +82,14 @@ size: Tiny - type: Sprite sprite: Objects/Consumable/Drinks/water_cup.rsi - layers: - - state: icon-0 - - state: icon-1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - type: SolutionContainerVisuals maxFillLevels: 1 - fillBaseName: icon- + inHandsFillBaseName: null - type: Tag tags: - Trash - DrinkCup - WhitelistChameleon - - type: Appearance - - type: TrashOnSolutionEmpty - solution: drink - type: Clothing slots: - HEAD @@ -240,16 +212,13 @@ - ReagentId: HotCocoa Quantity: 20 - type: Icon - sprite: Objects/Consumable/Drinks/hot_coco.rsi - state: icon-vend + sprite: Objects/Consumable/Drinks/mug.rsi + state: icon-vend-brown - type: Sprite - sprite: Objects/Consumable/Drinks/hot_coco.rsi layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: SolutionContainerVisuals - maxFillLevels: 4 + - state: icon + - state: fill-3 + map: ["enum.SolutionContainerLayers.Fill"] - type: TrashOnSolutionEmpty solution: drink @@ -267,16 +236,13 @@ - ReagentId: Coffee Quantity: 20 - type: Icon - sprite: Objects/Consumable/Drinks/hot_coffee.rsi - state: icon-vend + sprite: Objects/Consumable/Drinks/mug.rsi + state: icon-vend-brown - type: Sprite - sprite: Objects/Consumable/Drinks/hot_coffee.rsi layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: SolutionContainerVisuals - maxFillLevels: 4 + - state: icon + - state: fill-3 + map: ["enum.SolutionContainerLayers.Fill"] - type: TrashOnSolutionEmpty solution: drink @@ -293,16 +259,17 @@ reagents: - ReagentId: CafeLatte Quantity: 20 + - type: Icon + sprite: Objects/Consumable/Drinks/cafe_latte.rsi + state: icon-vend - type: Sprite sprite: Objects/Consumable/Drinks/cafe_latte.rsi layers: - - state: icon_empty - - state: fill-1 - map: ["enum.SolutionContainerLayers.Fill"] - - type: Appearance + - state: icon + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] - type: SolutionContainerVisuals maxFillLevels: 1 - fillBaseName: fill- changeColor: false - type: TrashOnSolutionEmpty solution: drink diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index 1197356553..f7c984171d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -8,9 +8,9 @@ collection: packetOpenSounds - type: Sprite layers: - - state: icon + - state: icon_empty map: ["enum.OpenableVisuals.Layer"] - - state: fill6 + - state: fill-6 map: [ "enum.SolutionContainerLayers.Fill" ] # already has liquid, so no visible: false - state: icon-front map: [ "enum.SolutionContainerLayers.Overlay" ] @@ -20,13 +20,6 @@ maxVol: 30 - type: SolutionContainerVisuals maxFillLevels: 6 - fillBaseName: fill # TODO rename to "fill-" - - type: GenericVisualizer - visuals: - enum.OpenableVisuals.Opened: - enum.OpenableVisuals.Layer: - True: {state: "icon_open"} - False: {state: "icon"} - type: TrashOnSolutionEmpty solution: drink @@ -97,8 +90,6 @@ components: - type: Sprite sprite: Objects/Consumable/Drinks/jar_what.rsi - - type: ExaminableSolution - solution: drink - type: FitsInDispenser solution: drink - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index d4fe5da5b6..10a2b76657 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -4,35 +4,23 @@ # Transformable container - normal glass - type: entity - parent: [DrinkBaseMaterialGlass, DrinkBaseCup] # todo parent to DrinkVisualsFillOverlay after in-hands are added + parent: [DrinkBaseMaterialGlass, DrinkBaseCup, DrinkVisualsFillOverlay] id: DrinkGlass name: metamorphic glass description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom. components: - type: Sprite sprite: Objects/Consumable/Drinks/glass_clear.rsi - layers: - - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay" - map: [ "enum.SolutionContainerLayers.Base" ] - - state: fill1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - state: icon-front - map: [ "enum.SolutionContainerLayers.Overlay" ] - - type: Appearance - type: SolutionContainerManager solutions: drink: maxVol: 30 - type: SolutionContainerVisuals maxFillLevels: 9 - fillBaseName: fill # todo rename to "fill-", add in-hands, then add parent "DrinkVisualsFillOverlay" metamorphic: true metamorphicDefaultSprite: sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon - inHandsMaxFillLevels: 3 - inHandsFillBaseName: -fill- - type: Tag tags: - DrinkCup # Do these tags @@ -47,14 +35,6 @@ components: - type: Sprite sprite: Objects/Consumable/Drinks/jar.rsi - layers: - - state: icon - map: [ "enum.SolutionContainerLayers.Base" ] - - state: fill1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - state: icon-front - map: [ "enum.SolutionContainerLayers.Overlay" ] - type: SolutionContainerManager solutions: drink: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index adc99f46ad..931620b665 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -12,17 +12,8 @@ size: Tiny - type: Sprite sprite: Objects/Consumable/Drinks/shotglass.rsi - layers: - - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFillOverlay" - map: [ "enum.SolutionContainerLayers.Base" ] - - state: fill1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - state: icon-front - map: [ "enum.SolutionContainerLayers.Overlay" ] - type: SolutionContainerVisuals maxFillLevels: 2 - fillBaseName: fill # TODO rename to "fill-" to match "DrinkVisualsFillOverlay" inHandsMaxFillLevels: 1 - type: FitsInDispenser solution: drink @@ -146,6 +137,21 @@ reactionTypes: - Shake +- type: entity + parent: DrinkShaker + id: DrinkShakerGold + name: golden shaker + description: A gold-plated shaker given as a token of appreciation for years of service. It doesn't make the drinks taste any different. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/shaker_gold.rsi + - type: Item + sprite: Objects/Consumable/Drinks/shaker_gold.rsi + - type: PhysicalComposition + materialComposition: + Gold: 10 # Gold plated, not solid gold + Steel: 40 + - type: entity parent: [DrinkBaseMaterialMetal, DrinkBase] id: DrinkJigger @@ -184,11 +190,6 @@ maxVol: 60 - type: Sprite sprite: Objects/Consumable/Drinks/pitcher.rsi - layers: - - state: icon # TODO add "icon_empty" state to match "DrinkVisualsFill" - - state: fill-1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - type: SolutionContainerVisuals maxFillLevels: 6 inHandsMaxFillLevels: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index bce7ace58a..d9475c9ebe 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -731,7 +731,7 @@ name: crostini parent: FoodBreadSliceBase id: FoodBreadBaguetteSlice - description: Bon ap-petite! + description: Bon ap-pétite! components: - type: Sprite state: crostini @@ -753,7 +753,7 @@ parent: FoodBreadBaguetteSlice id: FoodBreadBaguetteCottonSlice name: cotton crostini - description: Bon az-zetite! + description: Bon az-zétite! components: - type: Sprite state: crostini-cotton @@ -1001,3 +1001,57 @@ damage: groups: Brute: 1 + +- type: entity + parent: FoodBreadBase + id: FoodBreadNutriBatard + name: nutri-bâtard + description: bon 'pétite! + components: + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bread.rsi + state: batard + - type: Item + size: Small + storedOffset: -1,0 + heldPrefix: batard + - type: Tag + tags: + - ReptilianFood + - type: FlavorProfile + flavors: + - nutribrick + - peppery + - salty + - bread + +- type: entity + parent: FoodBreadNutriBatard + id: FoodBreadCottonNutriBatard + name: cotton nutri-bâtard + description: bon 'pétite! + components: + - type: Edible + requiresSpecialDigestion: true + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bread.rsi + state: batard-cotton + - type: FlavorProfile + flavors: + - peppery + - salty + - bread + - type: Tag + tags: + - ClothMade + - type: Item + size: Small + storedOffset: -1,0 + heldPrefix: batard-cotton + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Fiber + Quantity: 20 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 5717a12462..0e8f0ce56d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -533,6 +533,7 @@ tags: - Trash - HappyHonk + - BoxCardboard - type: StorageFill contents: - id: ToyMouse @@ -704,7 +705,8 @@ - type: Tag tags: - Trash - - CluwneHappyHonk + - CluwneHappyHonk # BAD: Intentional removal of parent tag + - BoxCardboard - type: Sprite sprite: Objects/Storage/Happyhonk/cluwne.rsi state: box @@ -882,7 +884,7 @@ grid: - 0,0,1,1 maxItemSize: Normal - whitelist: + whitelist: # TODO BoxCardboard shouldn't have whitelisted storage tags: - ClothMade - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 642a068069..1d7380bb9d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -1242,6 +1242,23 @@ - state: plain-cooked-inhand-right color: "#F7E3A3" +- type: entity + parent: FoodMeatChickenFried + id: FoodMeatChickenFriedVox + name: mystery fried chicken + description: “Eleven secret herbs and… oh no. That’s not chicken." + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Ammonia + Quantity: 3 + - type: entity parent: FoodMeatBase id: FoodMeatDuckCooked diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index e53e99e9db..27cc06023c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -864,10 +864,10 @@ - type: SolutionContainerManager solutions: food: - maxVol: 45 + maxVol: 25 reagents: - ReagentId: Fiber - Quantity: 40 + Quantity: 20 - type: Tag tags: - ClothMade diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml index 44edce5e07..d28fd027e5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml @@ -27,7 +27,7 @@ id: PackPaperRollingFilters description: A pack of filters and thin pieces of paper used to make fine smokeables. components: - - type: Storage + - type: Storage # Redundant whitelist: tags: - RollingPaper diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml index 259d36555e..254dcccde9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml @@ -65,4 +65,5 @@ - state: holo - type: Tag tags: - - BoxHug + - BoxCardboard + - BoxHug diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 34aff04489..7634f8e3a7 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -108,7 +108,7 @@ - ReagentId: Plasma Quantity: 10 canReact: false - - type: Tag + - type: Tag # Redundant tags: - Sheet - ConstructionMaterial diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml index cee720b6ea..632a27324a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml @@ -263,7 +263,7 @@ - type: Storage grid: - 0,0,5,3 - whitelist: + whitelist: # Redundant tags: - Document - type: ItemMapper diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 18995446b1..1545594b11 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -1,5 +1,5 @@ - type: entity - name: bible + name: space bible description: New Interstellar Version 2340. parent: BaseStorageItem id: Bible @@ -96,21 +96,10 @@ event: !type:SummonActionEvent - type: entity - parent: Bible - name: tanakh - description: "For God's chosen crewmembers" - id: BibleTanakh - components: - - type: Sprite - sprite: Objects/Specific/Chapel/tanakh.rsi - - type: Item - sprite: Objects/Specific/Chapel/tanakh.rsi - -- type: entity - parent: Bible - name: druidic tablet - description: "It's the mystery of the druids!" id: BibleDruid + name: druidic tablet + parent: Bible + description: "It's the mystery of the druids!" components: - type: Sprite sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi @@ -118,10 +107,10 @@ sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi - type: entity - parent: Bible - name: communist manifesto - description: "Remove the mask of humanity from Capital." id: BibleCommunistManifesto + name: communist manifesto + parent: Bible + description: "Remove the mask of humanity from Capital." components: - type: Sprite sprite: Objects/Specific/Chapel/communistmanifesto.rsi @@ -129,23 +118,45 @@ sprite: Objects/Specific/Chapel/communistmanifesto.rsi - type: entity + id: BibleNarsie + name: tome of nar'sie parent: Bible - name: satanic bible - description: "What could possibly go wrong?" - id: BibleSatanic + description: "What could possibly go wrong with a book covered in blood?" components: - type: Sprite - sprite: Objects/Specific/Chapel/satanicbible.rsi + sprite: Objects/Specific/Chapel/tomeofnarsie.rsi - type: Item - sprite: Objects/Specific/Chapel/satanicbible.rsi + sprite: Objects/Specific/Chapel/tomeofnarsie.rsi - type: entity - parent: Bible - name: codex nanotrasimus - description: "A familiar book containing the Sacred Operating Procedures." id: BibleNanoTrasen + name: codex nanotrasimus + parent: Bible + description: "A familiar book containing the Sacred Operating Procedures." components: - type: Sprite sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi - type: Item sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi + +- type: entity + id: BibleHonk + name: mirth of the honkmother + parent: Bible + description: "Oh great and glorious Mother, Mistress of Mirth, Matron of Mask and Merriments, Blessed is she amongst us jesters." + components: + - type: Sprite + sprite: Objects/Specific/Chapel/honk.rsi + - type: Item + sprite: Objects/Specific/Chapel/honk.rsi + +- type: entity + id: BibleRatvar + name: tablet of ratvar + parent: Bible + description: "A holy relic of the Clockwork Cult, blessed by the Clockwork Justice, Ratvar." + components: + - type: Sprite + sprite: Objects/Specific/Chapel/ratvartablet.rsi + - type: Item + sprite: Objects/Specific/Chapel/ratvartablet.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index fb740f1cd6..0117ec1255 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -278,9 +278,11 @@ parent: Plunger description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains. components: - - type: Tag + - type: Tag # TODO change Plunger into a tool so we dont got to layer Tags like below. tags: - GoldenPlunger + - Plunger + - WhitelistChameleon - type: Sprite sprite: Objects/Specific/Janitorial/golden_plunger.rsi state: plunger diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml index e622952b3f..1fd04ae36f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml @@ -5,7 +5,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeAntiMateriel - type: CartridgeAmmo proto: BulletAntiMateriel diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index fd465b71d6..8d4e9b8ffc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeCaselessRifle - type: CartridgeAmmo deleteOnSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index 51bf0fea54..a953985e9a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeHeavyRifle - type: CartridgeAmmo proto: BulletHeavyRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index bdd4758fd2..b4af723945 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeLightRifle - type: CartridgeAmmo proto: BulletLightRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index c7adfb5b1e..58862b9984 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeMagnum - type: CartridgeAmmo proto: BulletMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index faa094f7f5..ba2b856778 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgePistol - type: CartridgeAmmo proto: BulletPistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 2559349c4a..d4304ef803 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeRifle - type: CartridgeAmmo proto: BulletRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 72411fc134..3dfab5e84a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - ShellShotgun - type: CartridgeAmmo soundEject: @@ -26,7 +25,6 @@ components: - type: Tag tags: - - Cartridge - ShellShotgun - ShellShotgunLight - type: Sprite @@ -59,7 +57,6 @@ components: - type: Tag tags: - - Cartridge - ShellShotgun - ShellShotgunLight - type: Sprite @@ -118,7 +115,6 @@ components: - type: Tag tags: - - Cartridge - ShellShotgun - ShellShotgunLight - type: Sprite @@ -147,7 +143,6 @@ components: - type: Tag tags: - - Cartridge - ShellShotgun - ShellShotgunLight - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml index 6ec93e1778..510a8fef3e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeCap - type: CartridgeAmmo - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 6af54bb114..47c09282c6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -337,7 +337,7 @@ components: - type: BallisticAmmoProvider proto: CartridgePistol - whitelist: + whitelist: # Redundant tags: - CartridgePistol soundInsert: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 30967200d7..2f2ebfa5fd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -815,7 +815,7 @@ - type: entity name: energy shotgun - parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] id: WeaponEnergyShotgun description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. components: @@ -839,34 +839,69 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: ProjectileBatteryAmmoProvider - proto: BulletLaserSpread - fireCost: 150 + proto: BulletLaserSpreadNarrow + fireCost: 80 - type: BatteryWeaponFireModes fireModes: - - proto: BulletLaserSpread - fireCost: 150 - proto: BulletLaserSpreadNarrow - fireCost: 200 + fireCost: 80 - proto: BulletDisablerSmgSpread - fireCost: 120 + fireCost: 48 - type: Item size: Large sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi heldPrefix: energy + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Battery + maxCharge: 480 + startingCharge: 480 + +- type: entity + name: energy magnum + parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] + id: WeaponEnergyMagnum + description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-unshaded-1 + visible: false + map: [ "enum.GunVisualLayers.MagUnshaded" ] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi - type: Tag tags: - HighRiskItem - type: StealTarget - stealGroup: WeaponEnergyShotgun - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - - type: Battery - maxCharge: 1200 - startingCharge: 1200 + stealGroup: WeaponEnergyMagnum + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserMagnum + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserMagnum + fireCost: 150 + - proto: BulletLaserWindowPiercingMagnum + fireCost: 150 + - proto: BulletDisabler + fireCost: 62.5 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 24 + autoRechargeRate: 48 autoRechargePause: true - autoRechargePauseTime: 30 + autoRechargePauseTime: 10 - type: entity name: temperature gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index de9cea7e52..7a2b44e615 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -425,7 +425,7 @@ description: It fires large meteors. components: - type: BallisticAmmoProvider - whitelist: + whitelist: # Redundant tags: - CartridgeRocket proto: MeteorMedium @@ -438,7 +438,7 @@ description: It fires slow immovable rods. components: - type: BallisticAmmoProvider - whitelist: + whitelist: # Redundant tags: - CartridgeRocket proto: ImmovableRodSlow diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2134ac0cbf..d3e07c2e1b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1305,7 +1305,7 @@ spread: 30 - type: entity - name: narrow laser barrage + name: lethal laser barrage id: BulletLaserSpreadNarrow categories: [ HideSpawnMenu ] parent: BulletLaser @@ -1325,3 +1325,52 @@ proto: BulletDisablerSmg count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though spread: 9 + +- type: entity + name: magnum laser bolt + id: BulletLaserMagnum + categories: [ HideSpawnMenu ] + parent: BulletLaser + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi + layers: + - state: magnum + shader: unshaded + - type: PointLight + enabled: true + color: "#ff4300" + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 30 + +- type: entity + name: magnum window-piercing bolt + id: BulletLaserWindowPiercingMagnum + categories: [ HideSpawnMenu ] + parent: BulletLaser + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi + layers: + - state: magnum_piercing + shader: unshaded + - type: PointLight + enabled: true + color: "#ff4300" + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 20 + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Opaque diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 1f24828428..1ea835a2cd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -153,7 +153,7 @@ suffix: armor-piercing components: - type: RevolverAmmoProvider - whitelist: + whitelist: # Redundant tags: - CartridgeMagnum - SpeedLoaderMagnum diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 26db89ed32..e9faaece39 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -1,8 +1,8 @@ - type: entity - id: BaseMaterialDoor - parent: BaseStructure - name: door abstract: true + parent: BaseStructure + id: BaseMaterialDoor + name: door description: A door, where will it lead? components: - type: Anchorable @@ -63,31 +63,31 @@ - type: BlockWeather - type: entity + abstract: true parent: BaseMaterialDoor id: BaseMaterialDoorNavMap - abstract: true components: - type: NavMapDoor ### Metal doors ### - type: entity + parent: BaseMaterialDoorNavMap id: MetalDoor name: metal door - parent: BaseMaterialDoorNavMap components: - type: Construction graph: DoorGraph node: metalDoor - type: Destructible thresholds: - - trigger: + - trigger: &DamageTrigger200 # Overkill threshold !type:DamageTrigger damage: 200 - behaviors: + behaviors: &OverkillBehavior - !type:DoActsBehavior acts: ["Destruction"] - - trigger: + - trigger: &DamageTrigger150 !type:DamageTrigger damage: 150 behaviors: @@ -103,30 +103,20 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: PlasmaDoor name: plasma door - parent: BaseMaterialDoorNavMap - description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/plasma_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Construction graph: DoorGraph node: plasmaDoor - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 150 + - trigger: *DamageTrigger200 + behaviors: *OverkillBehavior + - trigger: *DamageTrigger150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -140,30 +130,20 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: GoldDoor name: gold door - parent: BaseMaterialDoorNavMap - description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/gold_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Construction graph: DoorGraph node: goldDoor - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 150 + - trigger: *DamageTrigger200 + behaviors: *OverkillBehavior + - trigger: *DamageTrigger150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -177,30 +157,20 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: SilverDoor name: silver door - parent: BaseMaterialDoorNavMap - description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/silver_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Construction graph: DoorGraph node: silverDoor - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 150 + - trigger: *DamageTrigger200 + behaviors: *OverkillBehavior + - trigger: *DamageTrigger150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -214,35 +184,26 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: BananiumDoor name: bananium door - parent: BaseMaterialDoorNavMap - description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/bananium_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Door - openSound: - path: /Audio/Items/bikehorn.ogg - closeSound: - path: /Audio/Items/bikehorn.ogg + openSound: &BikeHornSound + collection: BikeHorn + params: + variation: 0.125 + closeSound: *BikeHornSound - type: Construction graph: DoorGraph node: bananiumDoor - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 150 + - trigger: *DamageTrigger200 + behaviors: *OverkillBehavior + - trigger: *DamageTrigger150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -258,9 +219,9 @@ ### Other doors ### - type: entity + parent: BaseMaterialDoorNavMap id: WoodDoor name: wooden door - parent: BaseMaterialDoorNavMap components: - type: Sprite sprite: Structures/Doors/MineralDoors/wood_door.rsi @@ -273,16 +234,11 @@ graph: DoorGraph node: woodDoor - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] + - trigger: *DamageTrigger150 + behaviors: *OverkillBehavior - trigger: !type:DamageTrigger damage: 75 @@ -299,16 +255,12 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: PaperDoor name: paper door - parent: BaseMaterialDoorNavMap - description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/paper_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Door openSound: path: /Audio/Effects/paperdoor_openclose.ogg @@ -318,16 +270,11 @@ graph: DoorGraph node: paperDoor - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] + - trigger: *DamageTrigger150 + behaviors: *OverkillBehavior - trigger: !type:DamageTrigger damage: 50 @@ -344,16 +291,13 @@ max: 5 - type: entity + parent: BaseMaterialDoorNavMap id: WebDoor name: web door - parent: BaseMaterialDoorNavMap description: A door, leading to the lands of the spiders... or a spaced room. components: - type: Sprite sprite: Structures/Doors/web_door.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - type: Door closeSound: path: /Audio/Effects/rustle1.ogg @@ -366,21 +310,8 @@ damageModifierSet: Web - type: Destructible thresholds: - - trigger: # Excess damage, don't spawn entities - !type:DamageTrigger - damage: 100 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] + - trigger: *DamageTrigger150 + behaviors: *OverkillBehavior - trigger: !type:DamageTrigger damage: 50 @@ -397,8 +328,8 @@ max: 2 - type: entity - id: CardDoor parent: BaseMaterialDoorNavMap + id: CardDoor name: cardboard door components: - type: Sprite @@ -417,16 +348,11 @@ path: "/Audio/Weapons/pierce.ogg" - type: Damageable - damageContainer: StructuralInorganic damageModifierSet: Card - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 60 #excess damage (nuke?). avoid computational cost of spawning entities. - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] + - trigger: *DamageTrigger150 + behaviors: *OverkillBehavior - trigger: !type:DamageTrigger damage: 30 diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml index a24a03da3e..90893cd432 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -190,11 +190,7 @@ whitelist: tags: - Plunger - goldenplunger_slot: - name: janitorial-trolley-slot-component-slot-name-goldenplunger - whitelist: - tags: - - GoldenPlunger + - GoldenPlunger priority: 8 wetfloorsign_slot4: name: janitorial-trolley-slot-component-slot-name-sign diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 60fc1834fb..602b2d36fd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobQuartermaster - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout @@ -53,7 +53,7 @@ - type: loadout id: QuartermasterMantle - equipment: + equipment: neck: ClothingNeckMantleQM effects: - !type:GroupLoadoutEffect diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index c8c80c7895..b8a8744915 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -1,3 +1,12 @@ +- type: loadoutEffectGroup + id: SeniorBar + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBartender + time: 52h # 1 hour per week for 1 year + # Head - type: loadout id: BartenderHead @@ -40,3 +49,13 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar + +# Misc +- type: loadout + id: BartenderGoldenShaker + effects: + - !type:GroupLoadoutEffect + proto: SeniorBar + storage: + back: + - DrinkShakerGold diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index eb252a0c43..0bfc99d41f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -1,3 +1,33 @@ +# Playtime requirement for NanoTrasen Bible, Codex NanoTrasimus +- type: loadoutEffectGroup + id: NanoTrasenBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCaptain + time: 7200 #2 hrs + +# Playtime requirement for Druid Bible, Druidic Tablet +- type: loadoutEffectGroup + id: DruidBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBotanist + time: 18000 #5 hrs + +# Playtime requirement for Clown Bible, Mirth of the Honkmother +- type: loadoutEffectGroup + id: ClownBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 18000 #5 hrs + # Head - type: loadout id: ChaplainHead @@ -87,24 +117,39 @@ - type: loadout id: BibleDruid + effects: + - !type:GroupLoadoutEffect + proto: DruidBibleRequirement storage: back: - BibleDruid - type: loadout id: BibleNanoTrasen + effects: + - !type:GroupLoadoutEffect + proto: NanoTrasenBibleRequirement storage: back: - BibleNanoTrasen - + - type: loadout - id: BibleSatanic + id: BibleNarsie storage: back: - - BibleSatanic + - BibleNarsie - type: loadout - id: BibleTanakh + id: BibleHonk + effects: + - !type:GroupLoadoutEffect + proto: ClownBibleRequirement storage: back: - - BibleTanakh + - BibleHonk + +- type: loadout + id: BibleRatvar + storage: + back: + - BibleRatvar diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index d9c4faed8c..d902481f9c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -5,7 +5,7 @@ requirement: !type:RoleTimeRequirement role: JobJanitor - time: 187200 #52 hrs (1 hour per week for 1 year) + time: 52h # 1 hour per week for 1 year # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index edb9c8d1fc..1ed5e8aca0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 36000 #10 hrs, silly reward for people who play passenger a lot + time: 10h # silly reward for people who play passenger a lot # Head of Greytide (for grey mantle) - type: loadoutEffectGroup @@ -16,7 +16,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 72000 #20 hrs, fun mantle for the most experienced greytiders + time: 20h # fun mantle for the most experienced greytiders # Face - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 9043354a31..2951678968 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobCaptain - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 45223bea14..17a84b7386 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 72000 #20 hrs + time: 20h # Professional HoP Time - type: loadoutEffectGroup @@ -16,7 +16,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 54000 #15 hrs, special reward for HoP mains + time: 15h # special reward for HoP mains # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 13b72e0af4..55f184a168 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobChiefEngineer - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 82955fccfb..64bfe79a4d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -6,17 +6,17 @@ requirement: !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobStationEngineer - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Engineering - time: 216000 # 60 hrs + time: 60h # Head - type: startingGear diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 43bbc42f46..1444247083 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobChiefMedicalOfficer - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 3b43df4d4b..b5e5cc10e8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -6,17 +6,17 @@ requirement: !type:RoleTimeRequirement role: JobChemist - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Medical - time: 216000 # 60 hrs + time: 60h # Other Timers @@ -27,7 +27,7 @@ requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 108000 #30 hrs + time: 30h # Head diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index 2e607aca69..3717c1c67c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobResearchDirector - time: 72000 #20 hrs + time: 20h # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index e89802e9c1..080015f0da 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirement: !type:DepartmentTimeRequirement department: Science - time: 216000 #60 hrs + time: 60h # Head - type: startingGear diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 1f40d5e044..e85e1c8ccb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 6cc0dedf72..482e3ab896 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -6,12 +6,12 @@ requirement: !type:RoleTimeRequirement role: JobWarden - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Security - time: 216000 # 60 hrs + time: 60h #Security Star - type: loadoutEffectGroup @@ -21,7 +21,7 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 360000 #100 hrs + time: 100h # Head - type: loadout @@ -67,7 +67,7 @@ - type: loadout id: TrooperUniform - equipment: + equipment: jumpsuit: ClothingUniformSecurityTrooper - type: loadout diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 1ff3f1533e..8a474d359a 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobLibrarian - time: 3600 # 1 hour of being the biggest nerd on the station + time: 1h # for being the biggest nerd on the station - type: loadoutEffectGroup id: JensenTimer @@ -15,7 +15,7 @@ requirement: !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours of being a space trucker + time: 10h # 10 hours of being a space trucker # Basic options # Glasses @@ -41,4 +41,4 @@ - !type:GroupLoadoutEffect proto: JensenTimer equipment: - eyes: ClothingEyesGlassesJensen \ No newline at end of file + eyes: ClothingEyesGlassesJensen diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index ccaf3abe42..ad58f9c58d 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -6,7 +6,7 @@ requirement: !type:DepartmentTimeRequirement department: Command - time: 3600 # 1 hour + time: 1h # Flowers - type: loadout @@ -308,7 +308,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h storage: back: - TowelColorWhite @@ -320,7 +320,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 1800000 # 500hr + time: 500h storage: back: - TowelColorSilver @@ -332,7 +332,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 3600000 # 1000hr + time: 1000h storage: back: - TowelColorGold @@ -345,7 +345,7 @@ requirement: !type:DepartmentTimeRequirement department: Cargo - time: 360000 # 100hr + time: 100h storage: back: - TowelColorLightBrown @@ -358,7 +358,7 @@ requirement: !type:DepartmentTimeRequirement department: Civilian - time: 360000 # 100hr + time: 100h storage: back: - TowelColorGreen @@ -371,7 +371,7 @@ requirement: !type:DepartmentTimeRequirement department: Command - time: 360000 # 100hr + time: 100h storage: back: - TowelColorDarkBlue @@ -384,7 +384,7 @@ requirement: !type:DepartmentTimeRequirement department: Engineering - time: 360000 # 100hr + time: 100h storage: back: - TowelColorOrange @@ -397,7 +397,7 @@ requirement: !type:DepartmentTimeRequirement department: Medical - time: 360000 # 100hr + time: 100h storage: back: - TowelColorLightBlue @@ -410,7 +410,7 @@ requirement: !type:DepartmentTimeRequirement department: Science - time: 360000 # 100hr + time: 100h storage: back: - TowelColorPurple @@ -423,7 +423,7 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 360000 # 100hr + time: 100h storage: back: - TowelColorRed @@ -436,7 +436,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 360000 # 100hr + time: 100h storage: back: - TowelColorGray @@ -449,7 +449,7 @@ requirement: !type:RoleTimeRequirement role: JobChaplain - time: 360000 # 100hr + time: 100h storage: back: - TowelColorBlack @@ -462,7 +462,7 @@ requirement: !type:RoleTimeRequirement role: JobLibrarian - time: 360000 # 100hr + time: 100h storage: back: - TowelColorDarkGreen @@ -475,7 +475,7 @@ requirement: !type:RoleTimeRequirement role: JobLawyer - time: 360000 # 100hr + time: 100h storage: back: - TowelColorMaroon @@ -488,7 +488,7 @@ requirement: !type:RoleTimeRequirement role: JobClown - time: 360000 # 100hr + time: 100h storage: back: - TowelColorYellow @@ -501,7 +501,7 @@ requirement: !type:RoleTimeRequirement role: JobMime - time: 360000 # 100hr + time: 100h storage: back: - TowelColorMime diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7930b3ff1b..59e57739ce 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -270,6 +270,13 @@ - BartenderApron - BartenderWintercoat +- type: loadoutGroup + id: BartenderGoldenShaker + name: loadout-group-bartender-shaker + minLimit: 0 + loadouts: + - BartenderGoldenShaker + - type: loadoutGroup id: ChefHead name: loadout-group-chef-head @@ -381,10 +388,11 @@ minLimit: 1 loadouts: - Bible - - BibleDruid - BibleNanoTrasen - - BibleSatanic - - BibleTanakh + - BibleDruid + - BibleHonk + - BibleRatvar + - BibleNarsie - type: loadoutGroup id: JanitorHead diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f0a782361c..30b1cb17d2 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -61,6 +61,7 @@ - BartenderJumpsuit - CommonBackpack - BartenderOuterClothing + - BartenderGoldenShaker - Glasses - Survival - Trinkets diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 7cfbd2761e..a24e0f5dd3 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,7 +22,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - EnergyShotgunStealObjective: 0.5 + EnergyMagnumStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index d25908d154..0a223bd97c 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -85,11 +85,11 @@ state: icon - type: stealTargetGroup - id: WeaponEnergyShotgun - name: steal-target-groups-weapon-energy-shot-gun + id: WeaponEnergyMagnum + name: steal-target-groups-weapon-energy-magnum sprite: - sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi - state: base + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi + state: icon # Thief Collection diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 5f3b22c30d..26a4db42a0 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -243,7 +243,7 @@ - type: entity parent: BaseTraitorStealObjective - id: EnergyShotgunStealObjective + id: EnergyMagnumStealObjective components: - type: Objective # HoS will have this on them a lot of the time so.. @@ -251,7 +251,7 @@ - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: WeaponEnergyShotgun + stealGroup: WeaponEnergyMagnum owner: job-name-hos ## ce diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 68448bc0c9..f49e9f9671 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -96,7 +96,7 @@ color: "#664300" metamorphicSprite: sprite: Objects/Consumable/Drinks/cafe_latte.rsi - state: icon_empty + state: icon metamorphicMaxFillLevels: 1 metamorphicFillBaseName: fill- metamorphicChangeColor: false diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 5e464c1116..e2018b91a6 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -6,7 +6,7 @@ objective: roles-antag-nuclear-operative-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h guides: [ NuclearOperatives ] - type: antag @@ -17,10 +17,10 @@ objective: roles-antag-nuclear-operative-agent-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h - !type:RoleTimeRequirement role: JobChemist - time: 10800 # 3h + time: 3h guides: [ NuclearOperatives ] - type: antag @@ -31,10 +31,10 @@ objective: roles-antag-nuclear-operative-commander-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 18000 # 5h + time: 5h # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index eeef73b2d5..172876040a 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -7,7 +7,7 @@ guides: [ Revolutionaries ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/thief.yml b/Resources/Prototypes/Roles/Antags/thief.yml index 4b333ac495..740a7e217f 100644 --- a/Resources/Prototypes/Roles/Antags/thief.yml +++ b/Resources/Prototypes/Roles/Antags/thief.yml @@ -7,7 +7,7 @@ guides: [ Thieves ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: startingGear id: ThiefGear diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index 572adea1e4..edc130ef8b 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -7,7 +7,7 @@ guides: [ Traitors ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: TraitorSleeper @@ -18,7 +18,7 @@ guides: [ Traitors ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h # Syndicate Operative Outfit - Monkey - type: startingGear diff --git a/Resources/Prototypes/Roles/Antags/wizard.yml b/Resources/Prototypes/Roles/Antags/wizard.yml index 0ddf90ef2b..8ef9bda367 100644 --- a/Resources/Prototypes/Roles/Antags/wizard.yml +++ b/Resources/Prototypes/Roles/Antags/wizard.yml @@ -13,7 +13,7 @@ objective: roles-antag-wizard-objective # TODO: maybe give random objs and stationary ones from AntagObjectives and AntagRandomObjectives requirements: # I hate time locked roles but this should be enough time for someone to be acclimated - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h guides: [ Wizard ] # See wizard_startinggear for wiz start gear options diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index 4629e6b509..fa6561aa5e 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -7,7 +7,7 @@ guides: [ Zombies ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: Zombie diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 5a62c1dc8e..92b9b93671 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -6,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobCargoTechnician - time: 18000 #5 hrs + time: 5h - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 9000 #2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours + time: 10h weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 9bab10529b..7756f8dde9 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 9000 # 2.5 hrs + time: 2.5h icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 8881fb0d41..2d32b87f68 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index fd3941d4e0..734f22597c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 81c8b71050..11f07252a3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobLawyer requirements: - !type:OverallPlaytimeRequirement - time: 9000 # 2.5 hrs + time: 2.5h startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 293df524e9..8ff045173d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMime requirements: - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs + time: 4h startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index f98dac80ed..0c83971827 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index fa02e160a8..54251b263b 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,19 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Medical - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Science - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Security - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Command - time: 14400 # 4 hours + time: 4h weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index ac052e5cdf..4dfafb97d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,19 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 9000 # 2.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Medical - time: 9000 # 2.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Science - time: 9000 # 2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Security - time: 9000 # 2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Command - time: 9000 # 2.5 hours + time: 2.5h weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 5dda67f25d..20a6dc7ace 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 9000 #2.5 hrs + time: 2.5h startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 264e31a3ae..561d026020 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 9000 #2.5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobStationEngineer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Engineering - time: 36000 #10 hrs + time: 10h weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index c67e3067cb..c99140b095 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 9000 #2.5 hrs + time: 2.5h startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 24cef50e1a..afc0182c0f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -5,10 +5,10 @@ playTimeTracker: JobTechnicalAssistant requirements: - !type:OverallPlaytimeRequirement - time: 3600 #1 hr + time: 1h - !type:DepartmentTimeRequirement department: Engineering - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index e14fbd5b84..784ba81403 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 18000 #5 hrs + time: 5h startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index b6698091df..f67041a713 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,13 +8,13 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 9000 #2.5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobMedicalDoctor - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Medical - time: 36000 #10 hrs + time: 10h weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 4b43df2004..a41e95d400 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 9000 #2.5 hrs + time: 2.5h startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index d313d12d9b..0517d318e1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 18000 # 5 hrs + time: 5h inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 5526e63f24..da71ac0367 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 9000 #2.5 hrs + time: 2.5h startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 84ded8ed48..da84441e31 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -8,7 +8,7 @@ requirements: - !type:RoleTimeRequirement role: JobBorg - time: 18000 # 5 hrs + time: 5h canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd @@ -23,7 +23,7 @@ playTimeTracker: JobBorg requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index e824368cb7..96b95c3d58 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index da41d9f3e0..a7b057dc1b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,10 +6,10 @@ requirements: - !type:RoleTimeRequirement role: JobScientist - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Science - time: 36000 #10 hrs + time: 10h weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index e2e31f8dcf..5e8e1b6e14 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 9000 #2.5 hrs + time: 2.5h startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index e5c9fdf2dc..f59e1bf836 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7db7429263..1f73f48988 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,16 +6,16 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 3600 #1 hr + time: 1h - !type:RoleTimeRequirement role: JobDetective - time: 3600 #1 hr, knowing how to use the tools is important + time: 1h # knowing how to use the tools is important - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs + time: 10h weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index cac79f4822..8dc5815fcf 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,10 +5,10 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 10h - !type:DepartmentTimeRequirement department: Security - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 432c6b0d3c..141801e4ff 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 9000 #2.5 hrs + time: 2.5h startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 42964ee134..566b0da6d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,10 +6,10 @@ requirements: - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs + time: 10h weight: 5 startingGear: WardenGear icon: "JobIconWarden" diff --git a/Resources/Prototypes/Roles/requirement_overrides.yml b/Resources/Prototypes/Roles/requirement_overrides.yml index 62041f42d7..752249e90b 100644 --- a/Resources/Prototypes/Roles/requirement_overrides.yml +++ b/Resources/Prototypes/Roles/requirement_overrides.yml @@ -4,13 +4,13 @@ Captain: - !type:DepartmentTimeRequirement department: Engineering - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Medical - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Security - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Command - time: 3600 # 1 hour + time: 1h diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 1b49ebc776..d01db69e0d 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -52,6 +52,9 @@ points: 1 required: true defaultMarkings: [ VoxBeak ] + SnoutCover: + points: 1 + required: false Arms: points: 4 required: true diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 92c71a9eaf..4f6c018f23 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -40,10 +40,10 @@ id: Arrow # Storage whitelist: ClothingBeltQuiver - type: Tag - id: ArtifactFragment # Storage whitelist: OreBag, CargoBounty: BountyArtifactFragment, ConstructionGraph: Artifact + id: ArtifactFragment # Storage whitelist: OreBag. CargoBounty: BountyArtifactFragment. ConstructionGraph: Artifact - type: Tag - id: ATVKeys # Unused + id: ATVKeys # Unused x2 ## B ## @@ -57,7 +57,7 @@ id: Banana # CargoBounty: BountyBanana - type: Tag - id: BananaPeel # SpecialDigestible by OrganAnimalRuminantStomach, and several BananaClown ConstructionGraphs + id: BananaPeel # SpecialDigestible by OrganAnimalRuminantStomach. Several BananaClown ConstructionGraphs - type: Tag id: Bandana # CargoBounty: BountyBandana @@ -66,13 +66,13 @@ id: BaseballBat # CargoBounty: BountyBaseballBat - type: Tag - id: BBQsauce # Storage whitelist: ClothingBeltChef and FoodCartHot, ItemMapper: ClothingBeltChef and FoodCartHot + id: BBQsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot - type: Tag id: Bedsheet # CargoBounty: BountyBedsheet - type: Tag - id: Bee # Mode switch whitelisting for BuzzochloricBees (only damages non-bees) + id: Bee # Mode switching for BuzzochloricBees (only damages non-bees) - type: Tag id: Beer # CargoBounty: BountyBeer @@ -87,7 +87,7 @@ id: BlueprintAutolathe # Whitelist on BlueprintReceiverComponent on the autolate for linking this entity's BlueprintComponent - type: Tag - id: BodyBag # Storage whitelist: BoxBodyBag # TODO cardboard boxes shouldn't have whitelisting + id: BodyBag # Storage whitelist: BoxBodyBag - type: Tag id: Boll # MaterialStorage whitelist: Sheetifier @@ -147,16 +147,16 @@ id: BorgModuleSyndicateAssault # Cyborg module category for extra evil red robots (nukies) - type: Tag - id: Bot # Unused + id: Bot # Unused (Exists on MobRobotic, MobSupplyBot) - type: Tag - id: BotanyHatchet # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant + id: BotanyHatchet # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant - type: Tag - id: BotanyHoe # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant + id: BotanyHoe # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant - type: Tag - id: BotanyShovel # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant + id: BotanyShovel # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant - type: Tag # Used for specifically chemistry bottles id: Bottle # Storage whitelist: ChemMaster, ChemBag, SmartFridge, ClothingBeltJanitor, ClothingBeltMedical, ClothingBeltPlant @@ -165,10 +165,10 @@ id: BoxCardboard # CargoBounty: BountyCardboardBox - type: Tag - id: BoxHug # Unused + id: BoxHug # Unused (Exists on BoxHug, BoxHoloclown) - type: Tag - id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain. FoodSequenceElement: Brain + id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain - type: Tag id: BrassInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard @@ -177,7 +177,7 @@ id: Bread # CargoBounty: BountyBread. Blacklisted in BountyFruit and BountyVegetable - type: Tag - id: Briefcase # Unused + id: Briefcase # Unused (exists on BriefcaseBase) - type: Tag id: BrimFlatcapBrown # ConstructionGraph: BladedFlatcapBrown @@ -192,16 +192,16 @@ id: Bucket # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley. ConstructionGraph: CleanBot, scraphelmet - type: Tag - id: Burger # Unused x2 (this is the only place burger tag exists) + id: Burger # Food sequence key - type: Tag - id: BulletFoam # BallisticAmmoProviderComponent whitelist for WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox + id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox - type: Tag id: Burnt # Storage whitelist: ashtray. Seemingly redundant - type: Tag - id: Bun # FoodSequenceElement: BunTopBurger, CottonBunTopBurger + id: Bun # Unused (Exists on FoodSequenceElements BunTopBurger and CottonBunTopBurger) - type: Tag id: BypassDropChecks # Entities with this tag don't care about drop distance or walls (Aghost) @@ -212,414 +212,416 @@ ## C ## - type: Tag - id: CableCoil + id: CableCoil # Storage whitelist: ClothingBeltUtility, BorgModuleCable - type: Tag - id: Candle + id: Candle # Storage whitelist: BoxCandle - type: Tag - id: Cake + id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable - type: Tag - id: CaneBlade + id: CaneBlade # Storage whitelist: CaneSheath. ItemMapper: CaneSheath - type: Tag - id: CannonBall + id: CannonBall # Ammo: WeaponLauncherPirateCannon, ShuttleGunPirateCannon - type: Tag - id: CannotSuicide + id: CannotSuicide # Used by SuicideSystem. Entities with this tag ghost when attempting to suicide - type: Tag - id: CanPilot + id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships - type: Tag - id: CaptainSabre + id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath - type: Tag - id: Carpet + id: Carpet # Unused (exists on carpets (obviously)) - type: Tag - id: Carrot + id: Carrot # CargoBounty: BountyCarrot - type: Tag - id: CarrotFries + id: CarrotFries # CargoBounty: BountyCarrotFries - type: Tag - id: Carp + id: Carp # CargoBounty: BountyCarp + +- type: Tag # NOT bullets. This is for the cart to load PDA programs + id: Cartridge # Storage whitelist: BasePDA, TrashBag - type: Tag - id: Cartridge + id: CartridgeAntiMateriel # Ammo: WeaponSniperHristov, Musket, BaseMagazineBoxAntiMateriel - type: Tag - id: CartridgeAntiMateriel + id: CartridgeCap # Ammo: RevolverCapGun, RevolverCapGunFake, BaseSpeedLoaderCap - type: Tag - id: CartridgeCap + id: CartridgeCaselessRifle # Ammo: WeaponPistolCobra, BaseMagazineCaselessRifle, BaseMagazineBoxCaselessRifle - type: Tag - id: CartridgeCaselessRifle + id: CartridgeCHIMP # Unused x2 - type: Tag - id: CartridgeCHIMP + id: CartridgeHeavyRifle # Unused (exists on BaseCartridgeHeavyRifle) - type: Tag - id: CartridgeHeavyRifle + id: CartridgeLightRifle # Ammo: BaseWeaponLightMachineGun, BaseWeaponRifle, BaseWeaponSniper + # SpeedLoaderLightRifle, BaseMagazineLightRifle, BaseMagazineBoxLightRifle - type: Tag - id: CartridgeLightRifle + id: CartridgeMagnum # Ammo: BaseWeaponRevolver, RevolverCapGunFake, WeaponPistolN1984, WeaponPistolFlintlock, XenoArtifactGun + # BaseMagazineBoxMagnum, BaseMagazineMagnum, BaseSpeedLoaderMagnum - type: Tag - id: CartridgeMagnum + id: CartridgePistol # Ammo: BaseWeaponPistol, BasePistol, BaseWeaponSubMachineGun, WeaponPistolViper, WeaponSubMachineGunDrozd, WeaponSubMachineGunWt550 + # BaseMagazineBoxPistol, BaseMagazinePistol, BaseMagazinePistolHighCapacity, BaseMagazinePistolSubMachineGun, MagazinePistolSubMachineGunTopMounted, BaseSpeedLoaderPistol - type: Tag - id: CartridgePistol + id: CartridgeRifle # Ammo: BaseMagazineRifle, WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher, BaseMagazineBoxRifle - type: Tag - id: CartridgeRifle + id: CartridgeRocket # Ammo: WeaponLauncherRocket, WeaponLauncherMultipleRocket - type: Tag - id: CartridgeRocket - -# Allows you to walk over tile entities such as lava without steptrigger -- type: Tag - id: Catwalk + id: Catwalk # Allows you to walk over tile entities such as lava without steptrigger - type: Tag - id: CentrifugeCompatible + id: CentrifugeCompatible # Storage whitelist: MachineCentrifuge - type: Tag - id: Chicken + id: Chicken # MetamorphRecipe: FoodBurgerChicken - type: Tag - id: Cheese - -# Allowed to control someone wearing a Chef's hat if inside their hat. -- type: Tag - id: ChefPilot + id: Cheese # MetamorphRecipe: FoodBurgerCheese, FoodBurgerDuck - type: Tag - id: ChemDispensable # container that can go into the chem dispenser + id: ChefPilot # Allowed to control someone wearing a Chef's hat if inside their hat. - type: Tag - id: ChiliBowl + id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical - type: Tag - id: Cigarette + id: ChiliBowl # CargoBounty: BountyChili - type: Tag - id: CigFilter + id: Cigarette # Storage whitelist: Ashtray - type: Tag - id: CigPack + id: CigFilter # Storage whitelist: PackPaperRolling - type: Tag - id: Cleaver + id: CigPack # Storage whitelist: ClothingBeltUtility, ClothingBeltAssault, ClothingBeltChef, ClothingBeltMedical, ClothingBeltJanitor - type: Tag - id: ClockworkGlassShard + id: Cleaver # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef - type: Tag - id: ClothMade + id: ClockworkGlassShard # Unused (Exists on ShardGlassClockwork) - type: Tag - id: ClownMask + id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth - type: Tag - id: ClownRecorder + id: ClownMask # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownMask - type: Tag - id: ClownRubberStamp + id: ClownRecorder # ConstructionGraph: ClownHardsuit - type: Tag - id: ClownShoes + id: ClownRubberStamp # Unused: RubberStampClown - type: Tag - id: ClownSuit + id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes - type: Tag - id: CluwneHappyHonk + id: ClownSuit # ConstructionGraph: BananaClownJumpsuit - type: Tag - id: CluwneHorn + id: CluwneHappyHonk # ConstructionGraph: JonkBot - type: Tag - id: Cola + id: CluwneHorn # ConstructionGraph: JonkBot - type: Tag - id: Coldsauce + id: Cola # Storage whitelist: DrinkCanPack - type: Tag - id: CombatKnife + id: Coldsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot - type: Tag - id: ComputerTelevisionCircuitboard + id: CombatKnife # Storage whitelist: ClothingBeltSecurity - type: Tag - id: ConstructionMaterial + id: ComputerTelevisionCircuitboard # ConstructionGraph: WallmountTelevision - type: Tag - id: ConveyorAssembly + id: ConstructionMaterial # Storage whitelist: BorgModuleConstruction - type: Tag - id: CoordinatesDisk + id: ConveyorAssembly # ConstructionGraph: ConveyorGraph + +- type: Tag + id: CoordinatesDisk # Storage whitelist: DiskCase - type: Tag # designed to let corgis wear things; at present only for SmartCorgi. View PR 33737 on upstream for more dog wearables id: CorgiWearable - type: Tag #Ohioans die happy - id: Corn + id: Corn # CargoBounty: BountyCorn - type: Tag - id: CottonBoll + id: CottonBoll # CargoBounty: BountyCottonBoll - type: Tag - id: CottonBurger + id: CottonBurger # Food sequence key - type: Tag - id: Cow + id: Cow # Reproduction key - type: Tag - id: Crab + id: Crab # MetamorphRecipe: FoodBurgerCrab - type: Tag - id: Crayon + id: Crayon # SpecialDigestible: OrganAnimalStomach. CargoBounty: BountyCrayon - type: Tag - id: CrayonBlack + id: CrayonBlack # ConstructionGraph: MimeHardsuit. ItemMapper: CrayonBox - type: Tag - id: CrayonBlue + id: CrayonBlue # ItemMapper: CrayonBox - type: Tag - id: CrayonGreen + id: CrayonGreen # ItemMapper: CrayonBox - type: Tag - id: CrayonOrange + id: CrayonOrange # ItemMapper: CrayonBox - type: Tag - id: CrayonPurple + id: CrayonPurple # ConstructionGraph: ClownHardsuit. ItemMapper: CrayonBox - type: Tag - id: CrayonRed + id: CrayonRed # ConstructionGraph: MimeHardsuit, ClownHardsuit. ItemMapper: CrayonBox - type: Tag - id: CrayonWhite + id: CrayonWhite # ItemMapper: CrayonBox - type: Tag - id: CrayonYellow + id: CrayonYellow # ConstructionGraph: ClownHardsuit. ItemMapper: CrayonBox - type: Tag - id: Creamsicle + id: Creamsicle # Blacklist on BountyFruit - type: Tag - id: Crowbar + id: Crowbar # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer - type: Tag - id: CrowbarRed + id: CrowbarRed # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer - type: Tag - id: Cryobeaker + id: Cryobeaker # Unused x2 - type: Tag - id: CrystalBlack + id: CrystalBlack # ConstructionGraph: BlackLight, BlackLightBulb - type: Tag - id: CrystalBlue + id: CrystalBlue # ConstructionGraph: BlueLight, BlueLightBulb - type: Tag - id: CrystalCyan + id: CrystalCyan # ConstructionGraph: CyanLight, CyanLightBulb - type: Tag - id: CrystalGreen + id: CrystalGreen # ConstructionGraph: GreenLight, GreenLightBulb - type: Tag - id: CrystalOrange + id: CrystalOrange # ConstructionGraph: OrangeLight, OrangeLightBulb - type: Tag - id: CrystalPink + id: CrystalPink # ConstructionGraph: PinkLight, PinkLightBulb - type: Tag - id: CrystalRed + id: CrystalRed # ConstructionGraph: RedLight, RedLightBulb - type: Tag - id: CrystalYellow + id: CrystalYellow # ConstructionGraph: YellowLight, YellowLightBulb - type: Tag - id: CubanCarp + id: CubanCarp # CargoBounty: BountyCubanCarp ## D ## - type: Tag - id: DeathAcidifier + id: DeathAcidifier # Unused (Exists on DeathAcidifierImplant) - type: Tag - id: Debug + id: Debug # Exists on various debug / testing entities, but seemingly unused + +- type: Tag # Exists on diagonal walls and windows + id: Diagonal # Used by TileWallsCommand and FixRotationsCommand - type: Tag - id: Diagonal + id: Diamond # CargoBounty: BountySalvageDiamond - type: Tag - id: Diamond + id: Dice # Storage whitelist: BorgModuleService, DiceBag, BooksBag - type: Tag - id: Dice + id: DiscreteHealthAnalyzer # Storage whitelist: ClothingBeltMedical. ConstructionGraph: MediBot - type: Tag - id: DiscreteHealthAnalyzer #So construction recipes don't eat medical PDAs + id: DNASolutionScannable # Used by ForensicScannerSystem for scanning a solution container. Exists only on Puddle - type: Tag - id: DNASolutionScannable + id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination - type: Tag - id: DockArrivals + id: DockCargo # Unused x2 - type: Tag - id: DockCargo + id: DockEmergency # Used bv EmergencyShuttleSystem - type: Tag - id: DockEmergency + id: Document # A superset of Paper tag. Represents a paper-like entity with writing on it, but is not necessarily writeable itself. - type: Tag - id: Document + id: DonkPocket # Storage whitelist: FoodBoxDonkpocket - type: Tag - id: DonkPocket + id: Donut # Storage whitelist: FoodBoxDonut. CargoBounty: BountyDonut - type: Tag - id: Donut + id: DoorBumpOpener # Used by SharedDoorSystem to allow entities to open doors when they collide. - type: Tag - id: DoorBumpOpener + id: DoorElectronics # ConstructionGraph: PinionAirlock, BlastDoor, Windoor + # Used interchangeably with DoorElectronicsComponent, sometimes even in the same graph. TODO pick one - type: Tag - id: DoorElectronics + id: DoorElectronicsConfigurator # Used by ActivatableUIComponent on entity DoorElectronics to whitelist a tool to open the UI. - type: Tag - id: DoorElectronicsConfigurator + id: DrinkBottle # Storage whitelist: BoozeDispenserEmpty, SodaDispenserEmpty - type: Tag - id: DrinkBottle + id: DrinkCan # ConstructionGraph: FireBomb - type: Tag - id: DrinkCan + id: DrinkCup # Unused. Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass - type: Tag - id: DrinkCup + id: DrinkGlass # Unused. Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase - type: Tag - id: DrinkGlass + id: DrinkSpaceGlue # Unused. Exists on DrinkSpaceGlue, CrazyGlue - type: Tag - id: DrinkSpaceGlue + id: Dropper # Storage whitelist: ClothingBeltMedical, ClothingBeltPlant, ChemBag - type: Tag - id: Dropper - -- type: Tag - id: Duck + id: Duck # Reproduction key. MetamorphRecipe: FoodBurgerDuck ## E ## - type: Tag - id: Ectoplasm + id: Ectoplasm # ConstructionGraph: PlushieGhostRevenant - type: Tag - id: Egg + id: Egg # Storage whitelist: FoodContainerEgg - type: Tag - id: EmagImmune + id: EmagImmune # Default value in EmagComponent to prevent the emag - type: Tag - id: EmitterBolt + id: EmitterBolt # Default value in ContainmentFieldGeneratorComponent for collisions that power the generator - type: Tag - id: EncryptionCargo + id: EncryptionCargo # ItemMapper: TelecomServer - type: Tag - id: EncryptionCommand + id: EncryptionCommand # ItemMapper: TelecomServer - type: Tag - id: EncryptionCommon + id: EncryptionCommon # ItemMapper: TelecomServer - type: Tag - id: EncryptionElse + id: EncryptionElse # Unused x2 - type: Tag - id: EncryptionEngineering + id: EncryptionEngineering # ItemMapper: TelecomServer - type: Tag - id: EncryptionMedical + id: EncryptionMedical # ItemMapper: TelecomServer - type: Tag - id: EncryptionScience + id: EncryptionScience # ItemMapper: TelecomServer - type: Tag - id: EncryptionSecurity + id: EncryptionSecurity # ItemMapper: TelecomServer - type: Tag - id: EncryptionService + id: EncryptionService # ItemMapper: TelecomServer - type: Tag - id: Enzyme + id: Enzyme # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef - type: Tag - id: ExCable + id: ExCable # Placement blacklist on CableDetStack. Placement whitelist on WiredDetonator - type: Tag - id: ExplosivePassable + id: ExplosivePassable # Unused x2 ## F ## - type: Tag - id: FakeMindShieldImplant + id: FakeMindShieldImplant # Used by FakeMindShieldSystem to toggle the action when a chameleon outfit is selected - type: Tag - id: FakeNukeDisk + id: FakeNukeDisk # Exists so that the fake nuke disk can be blacklisted by storages that blacklist the real disk - type: Tag - id: Figurine + id: Figurine # Storage whitelist: BooksBag, BorgModuleService. CargoBounty: BountyFigurine - type: Tag - id: FireAlarm + id: FireAlarm # Used by AtmosAlarmableComponent for syncing devices - type: Tag - id: FireAlarmElectronics + id: FireAlarmElectronics # ConstructionGraph: FireAlarmAssembly - type: Tag - id: FireAxe + id: FireAxe # Storage whitelist: FireAxeCabinet - type: Tag - id: FirelockElectronics + id: FirelockElectronics # ConstructionGraph: Firelock - type: Tag - id: FireExtinguisher + id: FireExtinguisher # ConstructionGraph: FireBot - type: Tag - id: FireHelmet + id: FireHelmet # ConstructionGraph: FireBot - type: Tag - id: Flare + id: Flare # Storage whitelist: ClothingBeltUtility - type: Tag - id: Flashlight + id: Flashlight # Storage whitelist: ClothingBeltUtility, ClothingBeltJanitor - type: Tag - id: Flesh + id: Flesh # Used by FleshKudzu to ignore contacts with flesh creatures - type: Tag - id: Flower + id: Flower # CargoBounty: flowerwreath. CargoBounty: BountyFlower - type: Tag - id: Folder + id: Folder # Storage whitelist: Bookshelf, NoticeBoard - type: Tag - id: FoodSnack + id: FoodSnack # Storage whitelist: CandyBucket, CandyBowl. ItemMapper: CandyBowl - type: Tag - id: FootstepSound + id: FootstepSound # SharedMoverController checks for this before playing footstep sounds - type: Tag - id: ForceableFollow + id: ForceableFollow # Used by FollowerSystem to give entities an altverb to start orbiting the user - type: Tag id: ForceFixRotations # fixrotations command WILL target this @@ -628,10 +630,10 @@ id: ForceNoFixRotations # fixrotations command WON'T target this - type: Tag - id: FreezerElectronics + id: FreezerElectronics # ConstructionGraph: CrateFreezer, ClosetFreezer - type: Tag - id: Fruit + id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit ## G ## @@ -1070,7 +1072,7 @@ id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones - type: Tag - id: Paper + id: Paper # A writeable piece of paper. Subset of Document tag. SpecialDigestible: OrganMothStomach, OrganReptilianStomach - type: Tag id: Pancake @@ -1323,7 +1325,7 @@ id: SkeletonMotorcycleKeys - type: Tag - id: Skewer + id: Skewer # Food sequence key - type: Tag id: Slice # sliced fruit, vegetables, pizza etc. @@ -1436,7 +1438,7 @@ id: TabletopBoard - type: Tag - id: Taco + id: Taco # Food sequence key - type: Tag id: TabletopPiece diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 5dc1310be3..c7a2c9e983 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -91,9 +91,9 @@ - - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold]. + - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy magnum[/bold]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. diff --git a/Resources/Textures/Effects/speech.rsi/moth3.png b/Resources/Textures/Effects/speech.rsi/moth3.png index 93b1d1be74..8fd9b7a08d 100644 Binary files a/Resources/Textures/Effects/speech.rsi/moth3.png and b/Resources/Textures/Effects/speech.rsi/moth3.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png index 23744679b6..384717ce24 100644 Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png new file mode 100644 index 0000000000..879ceb7bde Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_hooked.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png new file mode 100644 index 0000000000..749be9cfb9 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_shaved.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png new file mode 100644 index 0000000000..53a2430cfb Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/beak_squarecere.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json index 143710ad9f..b00bec9bf0 100644 --- a/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant and Flareguy. tail_big tail_short and tail_docked modified from tail by Flareguy, tail_spiked modified from tail by TrixxedHeart", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart. tail_big tail_short and tail_docked modified from tail by Flareguy, beak_shaved/squarecere/hooked modified from beak and tail_spiked modified from tail by TrixxedHeart", "size": { "x": 32, "y": 32 @@ -11,6 +11,18 @@ "name": "beak", "directions": 4 }, + { + "name": "beak_squarecere", + "directions": 4 + }, + { + "name": "beak_shaved", + "directions": 4 + }, + { + "name": "beak_hooked", + "directions": 4 + }, { "name": "l_arm", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png new file mode 100644 index 0000000000..875018784b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_stripe.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png new file mode 100644 index 0000000000..ff394df8f8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/beakcover_tip.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png new file mode 100644 index 0000000000..5db759fe24 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/cheekblush.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png new file mode 100644 index 0000000000..e9214818db Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_1.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png new file mode 100644 index 0000000000..5f8dc43399 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/chest_v_2.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png new file mode 100644 index 0000000000..0130ae02b2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeliner.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json index 92dbbff751..5e6df07fe2 100644 --- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy, tail_talisman by TrixxedHeart", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy. beakcover_stripe, beakcover_tip, cheekblush, chest_v, nightbelt, tail_talisman, tattoo_arrow_head, tattoo_nightling_head (modified from nightling_s), underbelly, visage, visage_l and visage_r by TrixxedHeart", "size": { "x": 32, "y": 32 @@ -23,6 +23,22 @@ "name": "nightling_s", "directions": 4 }, + { + "name": "nightbelt", + "directions": 4 + }, + { + "name": "chest_v_1", + "directions": 4 + }, + { + "name": "chest_v_2", + "directions": 4 + }, + { + "name": "underbelly", + "directions": 4 + }, { "name": "tail_talisman", "directions": 4 @@ -47,9 +63,45 @@ "name": "eyeshadow_large", "directions": 4 }, + { + "name": "eyeliner", + "directions": 4 + }, + { + "name": "cheekblush", + "directions": 4 + }, { "name": "tail_ring", "directions": 4 + }, + { + "name": "beakcover_tip", + "directions": 4 + }, + { + "name": "beakcover_stripe", + "directions": 4 + }, + { + "name": "tattoo_arrow_head", + "directions": 4 + }, + { + "name": "tattoo_nightling_head", + "directions": 4 + }, + { + "name": "visage", + "directions": 4 + }, + { + "name": "visage_l", + "directions": 4 + }, + { + "name": "visage_r", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png new file mode 100644 index 0000000000..7df63a0bc4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightbelt.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png new file mode 100644 index 0000000000..63b097e940 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_arrow_head.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png new file mode 100644 index 0000000000..d48f4346a2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tattoo_nightling_head.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png new file mode 100644 index 0000000000..19232451de Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/underbelly.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png new file mode 100644 index 0000000000..d8190e56f2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png new file mode 100644 index 0000000000..fd1dc77915 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_l.png differ diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png new file mode 100644 index 0000000000..a2d13dbea6 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/visage_r.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png index 955e6c7b2a..59379e7d55 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/head.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png index 918b343f98..b7039d11d5 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png index 45b1ae82e7..ed2fe24fc5 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png index 01259ea03d..9896f1e17f 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/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png new file mode 100644 index 0000000000..c5d52da5d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon-vend.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png index c5d52da5d3..a5564b5976 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png deleted file mode 100644 index a5564b5976..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json index c3942590a6..737fc565b1 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json @@ -12,9 +12,6 @@ { "name": "icon" }, - { - "name": "icon_empty" - }, { "name": "fill-1" }, @@ -25,6 +22,9 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "icon-vend" } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-6.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-7.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-8.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill-9.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json index 16bcd31794..4f1b5d9173 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json @@ -14,31 +14,31 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { - "name": "fill3" + "name": "fill-3" }, { - "name": "fill4" + "name": "fill-4" }, { - "name": "fill5" + "name": "fill-5" }, { - "name": "fill6" + "name": "fill-6" }, { - "name": "fill7" + "name": "fill-7" }, { - "name": "fill8" + "name": "fill-8" }, { - "name": "fill9" + "name": "fill-9" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png rename to Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json index 6b42e9b9f7..ddffe3572d 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json @@ -14,19 +14,19 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { - "name": "fill3" + "name": "fill-3" }, { - "name": "fill4" + "name": "fill-4" }, { - "name": "fill5" + "name": "fill-5" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill3.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill4.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill5.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill6.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/fill-6.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_empty.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json index afc42a380e..a60196b83b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)", "states": [ { - "name": "icon" + "name": "icon_empty" }, { "name": "icon_open" @@ -17,22 +17,22 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { - "name": "fill3" + "name": "fill-3" }, { - "name": "fill4" + "name": "fill-4" }, { - "name": "fill5" + "name": "fill-5" }, { - "name": "fill6" + "name": "fill-6" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png deleted file mode 100644 index d2a5ef967a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png deleted file mode 100644 index c97ead8da8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png deleted file mode 100644 index 18ff175dad..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png deleted file mode 100644 index a60b6edb6d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png deleted file mode 100644 index 52a03df508..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json deleted file mode 100644 index b22da85aa9..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [{ - "name": "icon-0" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - }, - { - "name": "icon-4" - }, - { - "name": "icon-vend" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png deleted file mode 100644 index d2a5ef967a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png deleted file mode 100644 index c97ead8da8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png deleted file mode 100644 index 18ff175dad..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png deleted file mode 100644 index a60b6edb6d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png deleted file mode 100644 index 52a03df508..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png deleted file mode 100644 index 765112be76..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json deleted file mode 100644 index b22da85aa9..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [{ - "name": "icon-0" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - }, - { - "name": "icon-4" - }, - { - "name": "icon-vend" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-6.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-7.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-8.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png rename to Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill-9.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json index f7db09b523..59e2295761 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json @@ -14,31 +14,31 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { - "name": "fill3" + "name": "fill-3" }, { - "name": "fill4" + "name": "fill-4" }, { - "name": "fill5" + "name": "fill-5" }, { - "name": "fill6" + "name": "fill-6" }, { - "name": "fill7" + "name": "fill-7" }, { - "name": "fill8" + "name": "fill-8" }, { - "name": "fill9" + "name": "fill-9" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill3.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill4.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill5.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill6.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/fill-6.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_empty.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json index afc42a380e..a60196b83b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)", "states": [ { - "name": "icon" + "name": "icon_empty" }, { "name": "icon_open" @@ -17,22 +17,22 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { - "name": "fill3" + "name": "fill-3" }, { - "name": "fill4" + "name": "fill-4" }, { - "name": "fill5" + "name": "fill-5" }, { - "name": "fill6" + "name": "fill-6" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-vend-brown.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json index 052ebf11aa..3e7bc06ad1 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", @@ -26,6 +26,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon-vend-brown" } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json index d7e6f34541..8b87125a21 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte, inhands and modification by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json index 052ebf11aa..a64a38d5eb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png new file mode 100644 index 0000000000..ff1cc87098 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png new file mode 100644 index 0000000000..d7d28288a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png new file mode 100644 index 0000000000..a03626d8b0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json new file mode 100644 index 0000000000..3a5c625df4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/shaker_gold.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon taken from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi ; inhand sprites made by Failed (Discord: greetings_). Color adjustments by Hitlinemoss.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png rename to Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json index cf438684de..c7d6205b6f 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json @@ -14,10 +14,10 @@ "name": "icon-front" }, { - "name": "fill1" + "name": "fill-1" }, { - "name": "fill2" + "name": "fill-2" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-2.png rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-3.png rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-4.png rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json index 8f340a2eab..060a643bef 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json @@ -8,19 +8,19 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { - "name": "icon-2" + "name": "fill-2" }, { - "name": "icon-3" + "name": "fill-3" }, { - "name": "icon-4" + "name": "fill-4" }, { "name": "icon-vend-tea" diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json index 6301d09d7d..61406ac3b6 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json @@ -8,10 +8,10 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { - "name": "icon-0" + "name": "icon" }, { - "name": "icon-1" + "name": "fill-1" }, { "name": "inhand-right", diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png new file mode 100644 index 0000000000..d0ffbf4019 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png new file mode 100644 index 0000000000..ce48ffe182 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png new file mode 100644 index 0000000000..a2b3f0162f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-cotton.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png new file mode 100644 index 0000000000..42794c2ef2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png new file mode 100644 index 0000000000..664a6cda2b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png new file mode 100644 index 0000000000..12ccfa8ca6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/batard.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index d9142f7cf1..6a74ec1684 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,158 +1,180 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "alpha" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Cotton baguette and crostini variants by JuneSzalkowska. Batard by SurrealShibe (GitHub)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "alpha2" - }, - { - "name": "alpha-filling" - }, - { - "name": "alpha-filling2" - }, - { - "name": "alpha-slice" - }, - { - "name": "alpha-slice2" - }, - { - "name": "alpha-slice-filling" - }, - { - "name": "alpha-slice2-filling" - }, - { - "name": "baguette" - }, - { - "name": "baguette-equipped-BELT", - "directions": 4 - }, - { - "name": "baguette-inhand-left", - "directions": 4 - }, - { - "name": "baguette-inhand-right", - "directions": 4 - }, - { - "name": "baguette-cotton" - }, - { - "name": "baguette-cotton-equipped-BELT", - "directions": 4 - }, - { - "name": "baguette-cotton-inhand-left", - "directions": 4 - }, - { - "name": "baguette-cotton-inhand-right", - "directions": 4 - }, - { - "name": "banana" - }, - { - "name": "banana-slice" - }, - { - "name": "buttered-toast" - }, - { - "name": "cornbread" - }, - { - "name": "cornbread-slice" - }, - { - "name": "creamcheese" - }, - { - "name": "creamcheese-slice" - }, - { - "name": "crostini" - }, - { - "name": "crostini-cotton" - }, - { - "name": "cotton" - }, - { - "name": "cotton-slice" - }, - { - "name": "french-toast" - }, - { - "name": "garlic-slice" - }, - { - "name": "jelly-toast" - }, - { - "name": "meat" - }, - { - "name": "meat-slice" - }, - { - "name": "mimana" - }, - { - "name": "mimana-slice" - }, - { - "name": "moldy-slice" - }, - { - "name": "plain" - }, - { - "name": "plain-slice" - }, - { - "name": "plate" - }, - { - "name": "sausage" - }, - { - "name": "sausage-slice" - }, - { - "name": "spidermeat" - }, - { - "name": "spidermeat-slice" - }, - { - "name": "tofu" - }, - { - "name": "tofu-slice" - }, - { - "name": "two-slice" - }, - { - "name": "xenomeat" - }, - { - "name": "xenomeat-slice" - } - ] + "states": [ + { + "name": "alpha" + }, + { + "name": "alpha2" + }, + { + "name": "alpha-filling" + }, + { + "name": "alpha-filling2" + }, + { + "name": "alpha-slice" + }, + { + "name": "alpha-slice2" + }, + { + "name": "alpha-slice-filling" + }, + { + "name": "alpha-slice2-filling" + }, + { + "name": "baguette" + }, + { + "name": "baguette-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-inhand-left", + "directions": 4 + }, + { + "name": "baguette-inhand-right", + "directions": 4 + }, + { + "name": "baguette-cotton" + }, + { + "name": "baguette-cotton-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-cotton-inhand-left", + "directions": 4 + }, + { + "name": "baguette-cotton-inhand-right", + "directions": 4 + }, + { + "name": "banana" + }, + { + "name": "banana-slice" + }, + { + "name": "buttered-toast" + }, + { + "name": "cornbread" + }, + { + "name": "cornbread-slice" + }, + { + "name": "creamcheese" + }, + { + "name": "creamcheese-slice" + }, + { + "name": "crostini" + }, + { + "name": "crostini-cotton" + }, + { + "name": "cotton" + }, + { + "name": "cotton-slice" + }, + { + "name": "french-toast" + }, + { + "name": "garlic-slice" + }, + { + "name": "jelly-toast" + }, + { + "name": "meat" + }, + { + "name": "meat-slice" + }, + { + "name": "mimana" + }, + { + "name": "mimana-slice" + }, + { + "name": "moldy-slice" + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "plate" + }, + { + "name": "sausage" + }, + { + "name": "sausage-slice" + }, + { + "name": "spidermeat" + }, + { + "name": "spidermeat-slice" + }, + { + "name": "tofu" + }, + { + "name": "tofu-slice" + }, + { + "name": "two-slice" + }, + { + "name": "xenomeat" + }, + { + "name": "xenomeat-slice" + }, + { + "name": "batard" + }, + { + "name": "batard-inhand-left", + "directions": 4 + }, + { + "name": "batard-inhand-right", + "directions": 4 + }, + { + "name": "batard-cotton" + }, + { + "name": "batard-cotton-inhand-left", + "directions": 4 + }, + { + "name": "batard-cotton-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png index 2f29dff1c7..8b98bf5436 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png index 0d7d9cf676..1dcacda0e3 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png index 6e5e4cd27a..20c3c84cb2 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png index a38632e437..ba16466073 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png index 35fc35abf1..b65eae74ef 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png index 7e0df50bb5..bb02dc20cd 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png new file mode 100644 index 0000000000..caa8572835 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png new file mode 100644 index 0000000000..95b5790e89 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png new file mode 100644 index 0000000000..f1a5163cbc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png index 4e24e24ad2..85d3b716a3 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png index 4be96c2070..f27ffd7038 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png index bdf1c5e363..d345671051 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png new file mode 100644 index 0000000000..0e294639fa Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png new file mode 100644 index 0000000000..71ed63d933 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png new file mode 100644 index 0000000000..dcfac241cd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png deleted file mode 100644 index 2c0a574d58..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png deleted file mode 100644 index 1e6043fb41..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png deleted file mode 100644 index 60aba34bbb..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json deleted file mode 100644 index 9a00632eed..0000000000 --- a/Resources/Textures/Objects/Specific/Chapel/satanicbible.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord), modified by @SurrealShibe (Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} - diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png deleted file mode 100644 index c04412d52b..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png deleted file mode 100644 index 94fdcc0f20..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png deleted file mode 100644 index 56c5a517f1..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json deleted file mode 100644 index c0dd9096bc..0000000000 --- a/Resources/Textures/Objects/Specific/Chapel/tanakh.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} - diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png new file mode 100644 index 0000000000..92a2b5e138 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png new file mode 100644 index 0000000000..9cc27ac3c5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png new file mode 100644 index 0000000000..98151112f4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png index 13988bf1c4..4829eb6c7b 100644 Binary files a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json index 7e5a11d313..eda0e5aa7b 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github) and tweaked by Prole0 (github)", "states": [ { "name": "cart", diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png new file mode 100644 index 0000000000..56ff3c1509 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png new file mode 100644 index 0000000000..3f83ef42eb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..3f83ef42eb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png new file mode 100644 index 0000000000..b5c9f8a1f7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png new file mode 100644 index 0000000000..9384a6a861 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png new file mode 100644 index 0000000000..c2172122ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..e1e5161e0a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..8f2e879b02 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..6b863defb7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..7976821be1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json new file mode 100644 index 0000000000..293dcbdcbd --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by BoskiYourk (GitHub), edited by spanky-spanky (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.35, + 0.35, + 0.35, + 0.35 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png new file mode 100644 index 0000000000..4f9199b2bc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png new file mode 100644 index 0000000000..d35cd0a852 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json new file mode 100644 index 0000000000..73f61cbb15 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by BoskiYourk (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "magnum" + }, + { + "name": "magnum_piercing" + } + ] +} diff --git a/Resources/migration.yml b/Resources/migration.yml index 299fcfeefc..ea991259ed 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -721,3 +721,7 @@ ClothingUniformJumpsuitParamedicNT: ClothingUniformJumpsuitParamedic # 2025-08-29 PrefilledSyringe: Syringe + +# 2025-10-6 +BibleTanakh: null +BibleSatanic: null