diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs index 2d4033390c3a..2f7ebc37f73f 100644 --- a/Content.Client/PDA/PdaBoundUserInterface.cs +++ b/Content.Client/PDA/PdaBoundUserInterface.cs @@ -30,8 +30,7 @@ protected override void Open() private void CreateMenu() { - _menu = this.CreateWindow(); - _menu.OpenCenteredLeft(); + _menu = this.CreateWindowCenteredLeft(); _menu.FlashLightToggleButton.OnToggled += _ => { diff --git a/Content.Client/SS220/PdaIdPainter/PdaIdPainterSystem.cs b/Content.Client/SS220/PdaIdPainter/PdaIdPainterSystem.cs index 6e6355560122..5a272814f085 100644 --- a/Content.Client/SS220/PdaIdPainter/PdaIdPainterSystem.cs +++ b/Content.Client/SS220/PdaIdPainter/PdaIdPainterSystem.cs @@ -7,16 +7,12 @@ namespace Content.Client.SS220.PdaIdPainter; public sealed class PdaIdPainterSystem : SharedPdaIdPainterSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IComponentFactory _factory = default!; public override void Initialize() { base.Initialize(); - GetAllVariants(); - - SubscribeLocalEvent(OnProtoReloaded); SubscribeLocalEvent(HandleState); } @@ -25,27 +21,6 @@ private void HandleState(Entity ent, ref AfterAutoH UpdateVisuals(ent.Comp.NewProto, ent.Owner); } - private void OnProtoReloaded(PrototypesReloadedEventArgs args) - { - if (args.WasModified()) - GetAllVariants(); - } - - private void GetAllVariants() - { - PdaAndIdProtos.Clear(); - - var prototypes = _proto.EnumeratePrototypes(); - - foreach (var proto in prototypes) - { - if (!IsValidTarget(proto)) - continue; - - PdaAndIdProtos.Add(proto); - } - } - protected override void UpdateSprite(EntityUid uid, EntityPrototype proto) { base.UpdateSprite(uid, proto); diff --git a/Content.Client/SS220/SuperMatter/Emitter/Ui/SuperMatterEmitterExtensionMenu.xaml.cs b/Content.Client/SS220/SuperMatter/Emitter/Ui/SuperMatterEmitterExtensionMenu.xaml.cs index 7ba39258f8f2..166cc518f0f2 100644 --- a/Content.Client/SS220/SuperMatter/Emitter/Ui/SuperMatterEmitterExtensionMenu.xaml.cs +++ b/Content.Client/SS220/SuperMatter/Emitter/Ui/SuperMatterEmitterExtensionMenu.xaml.cs @@ -65,8 +65,9 @@ private void InitPowerConsumptionSpinBox() if (child.GetType() == typeof(LineEdit)) child.MinSize = new Vector2(60, 0); } - PowerConsumptionSpinBox.AddLeftButton(-100, "-100"); + PowerConsumptionSpinBox.AddLeftButton(-500, "-500"); + PowerConsumptionSpinBox.AddLeftButton(-100, "-100"); PowerConsumptionSpinBox.AddRightButton(100, "+100"); PowerConsumptionSpinBox.AddRightButton(500, "+500"); PowerConsumptionSpinBox.IsValid = PowerConsumptionValidate; diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs index bacc90eabffc..16545c357847 100644 --- a/Content.Client/Storage/StorageBoundUserInterface.cs +++ b/Content.Client/Storage/StorageBoundUserInterface.cs @@ -1,8 +1,10 @@ +using System.Numerics; using Content.Client.UserInterface.Systems.Storage; using Content.Client.UserInterface.Systems.Storage.Controls; using Content.Shared.Storage; using JetBrains.Annotations; using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; namespace Content.Client.Storage; @@ -11,6 +13,8 @@ public sealed class StorageBoundUserInterface : BoundUserInterface { private StorageWindow? _window; + public Vector2? Position => _window?.Position; + public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -21,7 +25,7 @@ protected override void Open() _window = IoCManager.Resolve() .GetUIController() - .CreateStorageWindow(Owner); + .CreateStorageWindow(this); if (EntMan.TryGetComponent(Owner, out StorageComponent? storage)) { @@ -50,10 +54,20 @@ public void Reclaim() protected override void Dispose(bool disposing) { base.Dispose(disposing); - Reclaim(); } + public void CloseWindow(Vector2 position) + { + if (_window == null) + return; + + // Update its position before potentially saving. + // Listen it makes sense okay. + LayoutContainer.SetPosition(_window, position); + _window?.Close(); + } + public void Hide() { if (_window == null) @@ -70,6 +84,15 @@ public void Show() _window.Visible = true; } + public void Show(Vector2 position) + { + if (_window == null) + return; + + Show(); + LayoutContainer.SetPosition(_window, position); + } + public void ReOpen() { _window?.Orphan(); diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs index 70e02c469396..8eab2d824953 100644 --- a/Content.Client/Storage/Systems/StorageSystem.cs +++ b/Content.Client/Storage/Systems/StorageSystem.cs @@ -19,6 +19,8 @@ public sealed class StorageSystem : SharedStorageSystem private Dictionary _oldStoredItems = new(); + private List<(StorageBoundUserInterface Bui, bool Value)> _queuedBuis = new(); + public override void Initialize() { base.Initialize(); @@ -72,7 +74,7 @@ private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref if (NestedStorage && player != null && ContainerSystem.TryGetContainingContainer((uid, null, null), out var container) && UI.TryGetOpenUi(container.Owner, StorageComponent.StorageUiKey.Key, out var containerBui)) { - containerBui.Hide(); + _queuedBuis.Add((containerBui, false)); } } } @@ -89,7 +91,7 @@ protected override void HideStorageWindow(EntityUid uid, EntityUid actor) { if (UI.TryGetOpenUi(uid, StorageComponent.StorageUiKey.Key, out var storageBui)) { - storageBui.Hide(); + _queuedBuis.Add((storageBui, false)); } } @@ -97,7 +99,7 @@ protected override void ShowStorageWindow(EntityUid uid, EntityUid actor) { if (UI.TryGetOpenUi(uid, StorageComponent.StorageUiKey.Key, out var storageBui)) { - storageBui.Show(); + _queuedBuis.Add((storageBui, true)); } } @@ -152,4 +154,30 @@ public void HandleAnimatingInsertingEntities(AnimateInsertingEntitiesEvent msg) } } } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + if (!_timing.IsFirstTimePredicted) + { + return; + } + + // This update loop exists just to synchronize with UISystem and avoid 1-tick delays. + // If deferred opens / closes ever get removed you can dump this. + foreach (var (bui, open) in _queuedBuis) + { + if (open) + { + bui.Show(); + } + else + { + bui.Hide(); + } + } + + _queuedBuis.Clear(); + } } diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs index 88b4c06d72c0..a4afebc217b6 100644 --- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs +++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs @@ -9,6 +9,7 @@ using Content.Shared.Input; using Content.Shared.Item; using Content.Shared.Storage; +using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -190,6 +191,26 @@ public void UpdateContainer(Entity? entity) BuildGridRepresentation(); } + private void CloseParent() + { + if (StorageEntity == null) + return; + + var containerSystem = _entity.System(); + var uiSystem = _entity.System(); + + if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) && + _entity.TryGetComponent(container.Owner, out StorageComponent? storage) && + storage.Container.Contains(StorageEntity.Value) && + uiSystem + .TryGetOpenUi(container.Owner, + StorageComponent.StorageUiKey.Key, + out var parentBui)) + { + parentBui.CloseWindow(Position); + } + } + private void BuildGridRepresentation() { if (!_entity.TryGetComponent(StorageEntity, out var comp) || comp.Grid.Count == 0) @@ -212,7 +233,9 @@ private void BuildGridRepresentation() }; exitButton.OnPressed += _ => { + // Close ourselves and all parent BUIs. Close(); + CloseParent(); }; exitButton.OnKeyBindDown += args => { @@ -220,6 +243,7 @@ private void BuildGridRepresentation() if (!args.Handled && args.Function == ContentKeyFunctions.ActivateItemInWorld) { Close(); + CloseParent(); args.Handle(); } }; @@ -258,7 +282,8 @@ private void BuildGridRepresentation() var containerSystem = _entity.System(); if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) && - _entity.TryGetComponent(container.Owner, out StorageComponent? storage)) + _entity.TryGetComponent(container.Owner, out StorageComponent? storage) && + storage.Container.Contains(StorageEntity.Value)) { Close(); @@ -267,7 +292,7 @@ private void BuildGridRepresentation() StorageComponent.StorageUiKey.Key, out var parentBui)) { - parentBui.Show(); + parentBui.Show(Position); } } }; @@ -412,6 +437,8 @@ public void BuildItemPieces() { if (storageComp.StoredItems.TryGetValue(ent, out var updated)) { + data.Control.Marked = IsMarked(ent); + if (data.Loc.Equals(updated)) { DebugTools.Assert(data.Control.Location == updated); @@ -450,12 +477,7 @@ public void BuildItemPieces() var gridPiece = new ItemGridPiece((ent, itemEntComponent), loc, _entity) { MinSize = size, - Marked = _contained.IndexOf(ent) switch - { - 0 => ItemGridPieceMarks.First, - 1 => ItemGridPieceMarks.Second, - _ => null, - } + Marked = IsMarked(ent), }; gridPiece.OnPiecePressed += OnPiecePressed; gridPiece.OnPieceUnpressed += OnPieceUnpressed; @@ -467,6 +489,16 @@ public void BuildItemPieces() } } + private ItemGridPieceMarks? IsMarked(EntityUid uid) + { + return _contained.IndexOf(uid) switch + { + 0 => ItemGridPieceMarks.First, + 1 => ItemGridPieceMarks.Second, + _ => null, + }; + } + protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); @@ -486,8 +518,9 @@ protected override void FrameUpdate(FrameEventArgs args) { if (StorageEntity != null && _entity.System().NestedStorage) { + // If parent container nests us then show back button if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) && - _entity.HasComponent(container.Owner)) + _entity.TryGetComponent(container.Owner, out StorageComponent? storageComp) && storageComp.Container.Contains(StorageEntity.Value)) { _backButton.Visible = true; } diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs index 5c3f0479827c..dbb16ab24acb 100644 --- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs +++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs @@ -11,6 +11,7 @@ using Content.Shared.Input; using Content.Shared.Interaction; using Content.Shared.Storage; +using Robust.Client.GameObjects; using Robust.Client.Input; using Robust.Client.Player; using Robust.Client.UserInterface; @@ -37,6 +38,7 @@ public sealed class StorageUIController : UIController, IOnSystemChanged _menuDragHelper; @@ -107,7 +109,7 @@ private void OnStaticStorageChanged(bool obj) StaticStorageUIEnabled = obj; } - public StorageWindow CreateStorageWindow(EntityUid uid) + public StorageWindow CreateStorageWindow(StorageBoundUserInterface sBui) { var window = new StorageWindow(); window.MouseFilter = Control.MouseFilterMode.Pass; @@ -127,9 +129,25 @@ public StorageWindow CreateStorageWindow(EntityUid uid) } else { - window.OpenCenteredLeft(); + // Open at parent position if it's open. + if (_ui.TryGetOpenUi(EntityManager.GetComponent(sBui.Owner).ParentUid, + StorageComponent.StorageUiKey.Key, out var bui) && bui.Position != null) + { + window.Open(bui.Position.Value); + } + // Open at the saved position if it exists. + else if (_ui.TryGetPosition(sBui.Owner, StorageComponent.StorageUiKey.Key, out var pos)) + { + window.Open(pos); + } + // Open at the default position. + else + { + window.OpenCenteredLeft(); + } } + _ui.RegisterControl(sBui, window); return window; } diff --git a/Content.Server/Administration/UI/AdminAnnounceEui.cs b/Content.Server/Administration/UI/AdminAnnounceEui.cs index b6a6ba998400..7f38685b5124 100644 --- a/Content.Server/Administration/UI/AdminAnnounceEui.cs +++ b/Content.Server/Administration/UI/AdminAnnounceEui.cs @@ -1,15 +1,18 @@ +using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; using Content.Server.Chat; using Content.Server.Chat.Managers; using Content.Server.Chat.Systems; using Content.Server.EUI; using Content.Shared.Administration; +using Content.Shared.Database; using Content.Shared.Eui; namespace Content.Server.Administration.UI { public sealed class AdminAnnounceEui : BaseEui { + [Dependency] private readonly IAdminLogManager _adminLogManager = default!; // SS220-add-eui-log [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IChatManager _chatManager = default!; private readonly ChatSystem _chatSystem; @@ -42,7 +45,10 @@ public override void HandleMessage(EuiMessageBase msg) Close(); break; } - + // SS220-add-eui-log + _adminLogManager.Add(LogType.Chat, LogImpact.Low, + $"Announcement from {Player:user}, announcer: {doAnnounce.Announcer}, message: {doAnnounce.Announcement}"); + // SS220-add-eui-log switch (doAnnounce.AnnounceType) { case AdminAnnounceType.Server: diff --git a/Content.Server/Fax/AdminUI/AdminFaxEui.cs b/Content.Server/Fax/AdminUI/AdminFaxEui.cs index e31d7b1c5808..baccc6f16084 100644 --- a/Content.Server/Fax/AdminUI/AdminFaxEui.cs +++ b/Content.Server/Fax/AdminUI/AdminFaxEui.cs @@ -10,12 +10,15 @@ using Content.Shared.Ghost; using Content.Shared.Paper; using Content.Shared.SS220.Photocopier; +using Content.Server.Administration.Logs; +using Content.Shared.Database; namespace Content.Server.Fax.AdminUI; public sealed class AdminFaxEui : BaseEui { [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IAdminLogManager _adminLogManager = default!; // SS220-add-eui-log private readonly FaxSystem _faxSystem; private readonly FollowerSystem _followerSystem; @@ -75,6 +78,10 @@ public override void HandleMessage(EuiMessageBase msg) PrototypeId = "PaperNtFormCc" }; + // SS220-add-eui-log + _adminLogManager.Add(LogType.Action, LogImpact.Low, + $"Announcement from {Player:user}, title is {sendData.Title}, content {sendData.Content}, stamp state '{sendData.StampState}', stamped by {sendData.From}"); + // SS220-add-eui-log var printout = new FaxPrintout(dataToCopy, metaData); _faxSystem.Receive(_entityManager.GetEntity(sendData.Target), printout); break; diff --git a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Database.cs b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Database.cs index f02cb2e00b30..711f5251def5 100644 --- a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Database.cs +++ b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Database.cs @@ -33,9 +33,6 @@ public void BroadcastData(Entity crystal) comp.Name ??= MetaData(crystal.Owner).EntityName; Dictionary gasRatios = new(); - if (!comp.AccumulatedGasesMoles.TryGetValue(Gas.Oxygen, out _)) - return; - foreach (var gas in Enum.GetValues()) { gasRatios.Add(gas, comp.AccumulatedGasesMoles[gas] / comp.AccumulatedGasesMoles.Values.Sum()); diff --git a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Delamination.cs b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Delamination.cs index fac00703733f..62ec4ee7862a 100644 --- a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Delamination.cs +++ b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.Delamination.cs @@ -99,7 +99,7 @@ private void Delaminate(Entity crystal) switch (smState) { case SuperMatterPhaseState.ResonanceRegion: - spawnedUid = Spawn(crystal.Comp.ResonanceSpawnPrototype, Transform(crystal.Owner).Coordinates); + _explosion.TriggerExplosive(crystal.Owner); break; case SuperMatterPhaseState.SingularityRegion: spawnedUid = Spawn(crystal.Comp.SingularitySpawnPrototype, Transform(crystal.Owner).Coordinates); diff --git a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.EventHandlers.cs b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.EventHandlers.cs index dc27d6aa14a7..b375c65268ff 100644 --- a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.EventHandlers.cs +++ b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.EventHandlers.cs @@ -5,12 +5,9 @@ using Content.Shared.Interaction; using Content.Shared.Projectiles; using Content.Shared.Tools.Components; -using Microsoft.EntityFrameworkCore.Migrations.Operations; -using Content.Server.Construction.Completions; -using Content.Shared.Destructible; using Content.Shared.SS220.SuperMatter.Ui; -using Microsoft.EntityFrameworkCore.Diagnostics; using Content.Shared.Humanoid; +using Content.Shared.Database; namespace Content.Server.SS220.SuperMatterCrystal; @@ -88,6 +85,7 @@ private void OnActivation(Entity entity, ref SuperMatterAc if (!entity.Comp.Activated) { SendAdminChatAlert(entity, Loc.GetString("supermatter-admin-alert-activated"), $"{EntityManager.ToPrettyString(args.Target)}"); + _adminLog.Add(LogType.Action, LogImpact.High, $"Crystal {ToPrettyString(entity):user} was activated by {ToPrettyString(args.Target):target}"); entity.Comp.Activated = true; } args.Handled = true; diff --git a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.cs b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.cs index f8784a5ff516..b6544cf23fc9 100644 --- a/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.cs +++ b/Content.Server/SS220/SuperMatter/Crystal/SuperMatterSystem.cs @@ -45,13 +45,20 @@ public override void Update(float frameTime) while (query.MoveNext(out var uid, out var smComp)) { if (!HasComp(uid) - || MetaData(uid).Initialized == false) + || MetaData(uid).EntityLifeStage < EntityLifeStage.MapInitialized) continue; // add here to give admins a way to freeze all logic if (HasComp(uid)) continue; + // I kinda fixed it, but in case of another misunderstanding + if (!smComp.AccumulatedGasesMoles.TryGetValue(Gas.Oxygen, out _)) + { + Log.Debug($"Dictionary for Supermatter crystal {ToPrettyString(uid)} gas accumulator isn't initialized!"); + continue; + } + var crystal = new Entity(uid, smComp); UpdateDelayed(crystal, flooredFrameTime); SuperMatterUpdate(crystal, flooredFrameTime); diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs index 5745136decf2..8808c400de7f 100644 --- a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs +++ b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs @@ -112,7 +112,7 @@ public sealed partial class DarkReaperComponent : Component public float StunAbilityLightBreakRadius = 4.5f; /// - /// StunAbilityConfusion - radius in which entities are affected by confusion + /// StunAbilityConfusion - radius in which entities are affected by confusion /// [DataField] public float StunAbilityConfusion = 12f; @@ -252,7 +252,7 @@ public sealed partial class DarkReaperComponent : Component { { "Slash", 20 }, { "Piercing", 16 }, - { "Structural", 80 } + { "Structural", 60 } } }; @@ -268,7 +268,8 @@ public sealed partial class DarkReaperComponent : Component Coefficients = new() { {"Radiation", 0}, - {"Piercing", 0.8f} + {"Piercing", 0.7f}, + {"Heat", 0.7f} } }, @@ -278,7 +279,8 @@ public sealed partial class DarkReaperComponent : Component Coefficients = new() { {"Radiation", 0}, - {"Piercing", 0.6f} + {"Piercing", 0.6f}, + {"Heat", 0.6f} } }, diff --git a/Content.Shared/SS220/PdaIdPainter/SharedPdaIdPainterSystem.cs b/Content.Shared/SS220/PdaIdPainter/SharedPdaIdPainterSystem.cs index 317c79db43ab..f82ded9bebd0 100644 --- a/Content.Shared/SS220/PdaIdPainter/SharedPdaIdPainterSystem.cs +++ b/Content.Shared/SS220/PdaIdPainter/SharedPdaIdPainterSystem.cs @@ -33,6 +33,8 @@ public override void Initialize() { base.Initialize(); + GetAllVariants(); + SubscribeLocalEvent(OnCompInit); SubscribeLocalEvent(OnCompRemove); @@ -41,6 +43,8 @@ public override void Initialize() SubscribeLocalEvent(OnPdaPicked); SubscribeLocalEvent(OnIdPicked); + + SubscribeLocalEvent(OnProtoReloaded); } private void OnCompInit(Entity ent, ref ComponentInit args) @@ -104,6 +108,9 @@ private void OnIdPicked(Entity ent, ref PdaIdPainterPicke if (!IsAllowed(ent.Owner, args.Actor)) return; + if (!_proto.TryIndex(args.Proto, out var prototype)) + return; + var target = ent.Comp.IdCardSlot.Item; if (target != null && TryComp(target, out var targetComp)) @@ -111,12 +118,36 @@ private void OnIdPicked(Entity ent, ref PdaIdPainterPicke Dirty(target.Value, targetComp); } - ent.Comp.IdChosenProto = args.Proto; + if (!PdaAndIdProtos.Contains(prototype)) + return; + + ent.Comp.IdChosenProto = prototype; Dirty(ent); UpdateVisuals(ent.Comp.IdChosenProto, target); } + private void OnProtoReloaded(PrototypesReloadedEventArgs args) + { + if (args.WasModified()) + GetAllVariants(); + } + + private void GetAllVariants() + { + PdaAndIdProtos.Clear(); + + var prototypes = _proto.EnumeratePrototypes(); + + foreach (var proto in prototypes) + { + if (!IsValidTarget(proto)) + continue; + + PdaAndIdProtos.Add(proto); + } + } + private bool IsAllowed(EntityUid entity, EntityUid owner) { if (!TryComp(entity, out var access)) @@ -129,7 +160,7 @@ private bool IsAllowed(EntityUid entity, EntityUid owner) return false; } - protected bool IsValidTarget(EntityPrototype proto) + private bool IsValidTarget(EntityPrototype proto) { if (proto.Abstract || proto.HideSpawnMenu) return false; diff --git a/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotComponent.cs b/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotComponent.cs new file mode 100644 index 000000000000..94481c928ffb --- /dev/null +++ b/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotComponent.cs @@ -0,0 +1,29 @@ +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Tools; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.SS220.ToggleableItemSlot; + +[RegisterComponent] +[NetworkedComponent] +public sealed partial class ToggleableItemSlotComponent : Component +{ + public const string HiddenSlot = "hidden_slot"; + + [DataField] + public ItemSlot HiddenItemSlot = new(); + + [DataField] + public ProtoId NeedTool = "Screwing"; + + [DataField] + public TimeSpan TimeToOpen = TimeSpan.FromSeconds(2f); + + [DataField] + public SoundSpecifier? SoundOpen = new SoundPathSpecifier("/Audio/Items/screwdriver.ogg"); + + [DataField] + public SoundSpecifier? SoundClosed = new SoundPathSpecifier("/Audio/Items/screwdriver.ogg"); +} diff --git a/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotSystem.cs b/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotSystem.cs new file mode 100644 index 000000000000..3acf62ea144f --- /dev/null +++ b/Content.Shared/SS220/ToggleableItemSlot/ToggleableItemSlotSystem.cs @@ -0,0 +1,102 @@ +using System.Linq; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.DoAfter; +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Tools.Systems; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Serialization; + +namespace Content.Shared.SS220.ToggleableItemSlot; + +public sealed class ToggleableItemSlotSystem : EntitySystem +{ + [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; + [Dependency] private readonly SharedToolSystem _tool = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnCompInit); + SubscribeLocalEvent(OnCompRemove); + + SubscribeLocalEvent(OnInteractUsing); + SubscribeLocalEvent(OnDoAfter); + + SubscribeLocalEvent(OnExamine); + } + + private void OnCompInit(Entity ent, ref ComponentInit args) + { + _itemSlots.AddItemSlot(ent.Owner, ToggleableItemSlotComponent.HiddenSlot, ent.Comp.HiddenItemSlot); + } + + private void OnCompRemove(Entity ent, ref ComponentRemove args) + { + _itemSlots.RemoveItemSlot(ent.Owner, ent.Comp.HiddenItemSlot); + } + + private void OnInteractUsing(Entity ent, ref InteractUsingEvent args) + { + var item = args.Used; + var user = args.User; + + if (!_tool.HasQuality(item, ent.Comp.NeedTool)) + return; + + if (!HasComp(ent.Owner)) + return; + + if (!_itemSlots.TryGetSlot(ent.Owner, ToggleableItemSlotComponent.HiddenSlot, out _)) + return; + + var doAfterArgs = new DoAfterArgs(EntityManager, + user, + ent.Comp.TimeToOpen, + new ToggleableItemSlotEvent(), + ent.Owner, + item) + { + BreakOnDamage = true, + BreakOnMove = true, + BreakOnDropItem = true, + BreakOnHandChange = true, + DuplicateCondition = DuplicateConditions.None, + }; + + _doAfter.TryStartDoAfter(doAfterArgs); + + args.Handled = true; + + } + + private void OnDoAfter(Entity ent, ref ToggleableItemSlotEvent args) + { + if (args.Cancelled || args.Handled) + return; + + if (ent.Comp.HiddenItemSlot.Locked) + { + _itemSlots.SetLock(ent.Owner, ent.Comp.HiddenItemSlot, false); + _audio.PlayPredicted(ent.Comp.SoundOpen, ent.Owner, args.User); + return; + } + + _itemSlots.SetLock(ent.Owner, ent.Comp.HiddenItemSlot, true); + _audio.PlayPredicted(ent.Comp.SoundClosed, ent.Owner, args.User); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + if(!ent.Comp.HiddenItemSlot.Locked) + args.PushMarkup(Loc.GetString("switch-toggle-item-slots-examine-open")); + } +} + +[Serializable] +[NetSerializable] +public sealed partial class ToggleableItemSlotEvent : DoAfterEvent +{ + public override DoAfterEvent Clone() => this; +} diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index dafd5c8760d3..4d08a5691d20 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -298,7 +298,7 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent< } else { - OpenStorageUI(uid, args.User, component); + OpenStorageUI(uid, args.User, component, false); } } }; @@ -318,11 +318,33 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent< args.Verbs.Add(verb); } + public void OpenStorageUI(EntityUid uid, EntityUid actor, StorageComponent? storageComp = null, bool silent = true) + { + // Handle recursively opening nested storages. + if (ContainerSystem.TryGetContainingContainer(uid, out var container) && + UI.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, actor)) + { + _nestedCheck = true; + HideStorageWindow(container.Owner, actor); + OpenStorageUIInternal(uid, actor, storageComp, silent: true); + _nestedCheck = false; + } + else + { + // If you need something more sophisticated for multi-UI you'll need to code some smarter + // interactions. + if (_openStorageLimit == 1) + UI.CloseUserUis(actor); + + OpenStorageUIInternal(uid, actor, storageComp, silent: silent); + } + } + /// /// Opens the storage UI for an entity /// /// The entity to open the UI for - public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = true) + private void OpenStorageUIInternal(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = true) { if (!Resolve(uid, ref storageComp, false)) return; @@ -407,24 +429,7 @@ private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInW } else { - // Handle recursively opening nested storages. - if (ContainerSystem.TryGetContainingContainer((args.Target, null, null), out var container) && - UI.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, args.User)) - { - _nestedCheck = true; - HideStorageWindow(container.Owner, args.User); - OpenStorageUI(uid, args.User, storageComp, silent: true); - _nestedCheck = false; - } - else - { - // If you need something more sophisticated for multi-UI you'll need to code some smarter - // interactions. - if (_openStorageLimit == 1) - UI.CloseUserUis(args.User); - - OpenStorageUI(uid, args.User, storageComp, silent: false); - } + OpenStorageUI(uid, args.User, storageComp, false); } args.Handled = true; diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 5b42f4ea23a1..a1efa8b13e06 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,281 +1,4 @@ Entries: -- author: kirus59 - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0435\ - \u0446\u0435\u043F\u0442\u044B \u0441 \u043A\u043E\u043D\u0434\u0435\u043D\u0441\ - \u0430\u0442\u043E\u0440\u0430\u043C\u0438. \u0422\u0435\u043F\u0435\u0440\u044C\ - \ \u0440\u0430\u0441\u0445\u043E\u0434\u0443\u0435\u0442\u0441\u044F \u043D\u0435\ - \ \u0432\u0435\u0441\u044C \u0438\u0445 \u0441\u0442\u0430\u043A, \u0430 \u043B\ - \u0438\u0448\u044C 1 \u0435\u0434. \u0438\u0437 \u0441\u0442\u0430\u043A\u0430\ - ." - type: Fix - id: 354 - time: '2024-08-05T22:57:56.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1517 -- author: kirus59 - changes: - - message: "\u0411\u043E\u0440\u0433\u0430\u043C \u0434\u043E\u0431\u0430\u0432\u043B\ - \u0435\u043D\u0430 \u0432\u044B\u0434\u0430\u0447\u0430 \u0440\u0430\u043D\u0434\ - \u043E\u043C\u043D\u043E\u0433\u043E \u0422\u0422\u0421 (\u0438\u0437 \u0441\ - \u0432\u043E\u0435\u0433\u043E \u0441\u043F\u0438\u0441\u043A\u0430) \u043F\u0440\ - \u0438 \u0438\u0445 \u0441\u043F\u0430\u0432\u043D\u0435/\u0441\u0431\u043E\u0440\ - \u043A\u0435" - type: Add - id: 355 - time: '2024-08-05T23:18:02.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1505 -- author: MiraHell - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0433\u043B\ - \u0443\u0448\u0435\u043D\u0438\u0435 \u0443 \u0441\u0432\u0435\u0442\u043E\u0448\ - \u0443\u043C\u043E\u0432\u043E\u0439 \u0433\u0440\u0430\u043D\u0430\u0442\u044B" - type: Add - id: 356 - time: '2024-08-06T18:29:59.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1530 -- author: inlef - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ - \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043F\u0435\u0440\u0435\u043D\ - \u0435\u0441\u0442\u0438 \u043C\u043D\u043E\u0433\u043E\u0441\u0431\u043E\u0440\ - \u043D\u043E\u0441\u0442\u044C \u0441\u0442\u0435\u0440\u0438\u043B\u044C\u043D\ - \u044B\u043C\u0438 \u043F\u0430\u043B\u043E\u0447\u043A\u0430\u043C\u0438 \u0441\ - \ \u0448\u0430\u043D\u0441\u043E\u043C 15%" - type: Add - id: 357 - time: '2024-08-06T18:31:06.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1528 -- author: Lancevrot - changes: - - message: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430\ - \u0440\u044F\u0434\u043E\u0432 EMP-\u0438\u043C\u043F\u043B\u0430\u043D\u0442\ - \u0430 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u043E \u0434\u043E 5." - type: Tweak - - message: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430\ - \u0440\u044F\u0434\u043E\u0432 \u0441\u043A\u0440\u0430\u043C-\u0438\u043C\u043F\ - \u043B\u0430\u043D\u0442\u0430 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u043E\ - \ \u0434\u043E 12." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u043C\u0435\u0442\ - \u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u043D\u043E\u0436\u0435\u0439\ - \ \u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u0438\u0437\u043C\u0435\ - \u043D\u0435\u043D\u0430 \u0434\u043E 4 \u0422\u041A." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0441\u0438\u0433\ - \u0430\u0440\u0435\u0442 \u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u0443\ - \u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0434\u043E 1 \u0422\u041A\ - ." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0438\u043C\u043F\ - \u043B\u0430\u043D\u0442\u0430 \u043E\u0441\u0432\u043E\u0431\u043E\u0436\u0434\ - \u0435\u043D\u0438\u044F \u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u0443\ - \u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0434\u043E 3 \u0422\u041A\ - ." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C EMP-\u0438\u043C\ - \u043F\u043B\u0430\u043D\u0442\u0430 \u0432 \u0430\u043F\u043B\u0438\u043D\u043A\ - \u0435 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0434\u043E 1\ - \ \u0422\u041A." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0438\u043C\u043F\ - \u043B\u0430\u043D\u0430\u0442-\u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u0432\ - \ \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u0443\u043C\u0435\u043D\u044C\u0448\ - \u0435\u043D\u0430 \u0434\u043E 1 \u0422\u041A." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0438\u043C\u043F\ - \u043B\u0430\u043D\u0430\u0442-\u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u0432\ - \ \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u0443\u043C\u0435\u043D\u044C\u0448\ - \u0435\u043D\u0430 \u0434\u043E 1 \u0422\u041A." - type: Tweak - - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C EVA \u0432 \u0430\ - \u043F\u043B\u0438\u043D\u043A\u0435 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\ - \u043D\u0430 \u0434\u043E 1 \u0422\u041A." - type: Tweak - - message: "\u041E\u0431\u044A\u0435\u043C \u0431\u0430\u043B\u043B\u043E\u043D\u0430\ - \ \u0432 \u043C\u0430\u0433\u043D\u0438\u0442\u043D\u044B\u0445 \u0431\u043E\ - \u0442\u0438\u043D\u043A\u0430\u0445 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\ - \u0442\u0430 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D \u0434\u043E 5." - type: Tweak - - message: "\u0423\u0440\u043E\u043D \u0442\u0443\u0440\u0435\u043B\u0438 \u0441\ - \u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430 \u0443\u0432\u0435\u043B\u0438\ - \u0447\u0435\u043D \u0434\u043E 200." - type: Tweak - - message: "\u0411\u043E\u0435\u0437\u0430\u043F\u0430\u0441 \u0442\u0443\u0440\u0435\ - \u043B\u0438 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430 \u0443\u0432\ - \u0435\u043B\u0438\u0447\u0435\u043D \u0434\u043E 100." - type: Tweak - id: 358 - time: '2024-08-06T18:55:41.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1157 -- author: kirus59 - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043A\u043E\u0432\ - \u044B\u043B\u044F\u043D\u0438\u0435 (\u043A\u0430\u043A \u043F\u0440\u0438\ - \ \u043D\u043E\u0448\u0435\u043D\u0438\u0438 \u043A\u043B\u043E\u0443\u043D\u0441\ - \u043A\u0438\u0445 \u0442\u0443\u0444\u0435\u043B\u044C) \u043F\u0440\u0438\ - \ \u0432\u0434\u044B\u0445\u0430\u043D\u0438\u0438 \u0444\u0440\u0435\u0437\u043E\ - \u043D\u0430." - type: Add - id: 359 - time: '2024-08-06T19:57:04.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1527 -- author: Ady4 - changes: - - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u0441\u0435 \u0444\u0438\ - \u0433\u0443\u0440\u043A\u0438 \u0438\u043C\u0435\u044E\u0442 \u0441\u0432\u043E\ - \u0438 \u0443\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u0444\u0440\ - \u0430\u0437\u044B. \u041C\u0438\u043C \u0441\u043A\u0440\u043E\u043C\u043D\u043E\ - \ \u043C\u043E\u043B\u0447\u0438\u0442." - type: Add - id: 360 - time: '2024-08-07T03:58:54.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1525 -- author: stalengd - changes: - - message: "\u0422\u043E\u0440\u0433\u043E\u0432\u0430\u044F \u0441\u0442\u0430\u043D\ - \u0446\u0438\u044F \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435\u0434\u0432\ - \u0438\u0436\u0438\u043C\u0430" - type: Tweak - id: 361 - time: '2024-08-07T20:00:28.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1541 -- author: stalengd - changes: - - message: "\u0422\u0430\u0441\u043A\u0430\u043D\u0438\u0435 \u043F\u0440\u0435\u0434\ - \u043C\u0435\u0442\u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\ - \ \u043C\u0435\u0448\u0430\u0435\u0442 \u0443\u043D\u0430\u0442\u0445\u0430\u043C\ - \ \u0431\u0440\u0430\u0442\u044C \u043E\u0440\u0443\u0436\u0438\u0435 \u0432\ - \ \u0434\u0432\u0435 \u0440\u0443\u043A\u0438" - type: Fix - id: 362 - time: '2024-08-07T20:15:19.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1539 -- author: Kerch91 - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u0438\u043D\u0438\ - \u0439 \u043A\u043E\u0441\u0442\u044E\u043C \u0443\u0431\u043E\u0440\u0449\u0438\ - \u043A\u0430" - type: Add - id: 363 - time: '2024-08-07T20:15:57.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1540 -- author: MIXnikita - changes: - - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ - \u0439\u0442\u044B \u043A\u043B\u043E\u0443\u043D\u0441\u043A\u043E\u0439, \u043F\ - \u0435\u0441\u0447\u0430\u043D\u0438\u043A\u043E\u0432\u043E\u0439 \u0438 \u0434\ - \u0435\u0440\u0435\u0432\u044F\u043D\u043D\u043E\u0439 \u0441\u0442\u0435\u043D\ - \u044B." - type: Tweak - id: 364 - time: '2024-08-07T20:59:12.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1535 -- author: Kemran - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ - \ \u0441 \u0448\u043B\u0435\u043C\u043E\u043C \u0441\u043A\u0430\u0444\u0430\ - \u043D\u0434\u0440\u0430 \u0421\u0418." - type: Fix - id: 365 - time: '2024-08-07T21:04:53.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1536 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0435\ - \u043F\u043E\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043A\u043E\u0441\u043C\ - \u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043C\u0435\u0434\u0438\u043F\u0435\ - \u043D\u043E\u0432 \u0432 \u0430\u0437\u043E\u0442\u043D\u044B\u0445 \u0430\u0432\ - \u0430\u0440\u0438\u0439\u043D\u044B\u0445 \u0437\u0430\u043F\u0430\u0441\u0430\ - \u0445" - type: Fix - id: 366 - time: '2024-08-10T06:59:47.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1556 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u0435\ - \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u0430\u044F \u0440\u0430\u0431\ - \u043E\u0442\u0430 \u0440\u0435\u0437\u043A\u0438 \u043F\u0440\u043E\u0432\u043E\ - \u0434\u043E\u0432 \u0432 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445\ - \ \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0430\u0445" - type: Fix - id: 367 - time: '2024-08-10T07:01:14.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1558 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\ - \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u043F\u0438\u0432\u043D\ - \u043E\u0433\u043E \u0434\u0435\u0440\u0436\u0430\u0442\u0435\u043B\u044F" - type: Fix - id: 368 - time: '2024-08-10T07:03:10.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1561 -- author: Gnomeev - changes: - - message: "\u0412 \u043F\u043E\u0434\u043A\u043E\u0432\u0430\u043D\u043D\u044B\u0435\ - \ \u0431\u043E\u0442\u0438\u043D\u043A\u0438 \u0421\u0411 \u0431\u044B\u043B\ - \ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043D\u043E\u0436!" - type: Fix - id: 369 - time: '2024-08-10T07:04:23.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1562 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043F\u0435\ - \u0440\u0435\u043C\u0435\u0449\u0430\u0435\u043C\u043E\u0435 \u0437\u043D\u0430\ - \u0447\u0435\u043D\u0438\u0435 \u0436\u0438\u0434\u043A\u043E\u0441\u0442\u0438" - type: Fix - id: 370 - time: '2024-08-10T09:25:50.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1560 -- author: kirus59, okroshka1984, Bomjojuk - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043D\u043E\u0432\u044B\ - \u0439 \u0445\u0430\u0439\u0440\u0438\u0441\u043A \u0434\u043B\u044F \u041A\u0432\ - \u0430\u0440\u0442\u0438\u0440\u043C\u0435\u0439\u0441\u0442\u0435\u0440\u0430\ - \ - \u0433\u0440\u0430\u0432\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\ - \u0439 \u043A\u0430\u0441\u0442\u0435\u0442!" - type: Add - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0446\u0435\u043B\ - \u044C \u043D\u0430 \u043A\u0440\u0430\u0436\u0443 \u043A\u0430\u0441\u0442\u0435\ - \u0442\u0430 \u0434\u043B\u044F \u0442\u0440\u0435\u0439\u0442\u043E\u0440\u043E\ - \u0432." - type: Add - id: 371 - time: '2024-08-12T04:39:07.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1415 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\ - \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u043D\u0435\u043A\u043E\ - \u0442\u043E\u0440\u044B\u0445 \u043A\u043E\u043C\u0431\u0438\u043D\u0435\u0437\ - \u043E\u043D\u043E\u0432 \u0432 \u0440\u0443\u043A\u0430\u0445" - type: Fix - id: 372 - time: '2024-08-12T14:09:56.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1569 -- author: MIXnikita - changes: - - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ - \u0439\u0442\u044B \u0431\u0430\u0437\u0430\u043B\u044C\u0442\u043E\u0432\u043E\ - \u0439 \u0438 \u043F\u0435\u0441\u0447\u0430\u043D\u043D\u0438\u043A\u043E-\u0431\ - \u0443\u043B\u044B\u0436\u043D\u0438\u043A\u043E\u0432\u043E\u0439 \u0441\u0442\ - \u0435\u043D\u044B" - type: Tweak - id: 373 - time: '2024-08-12T14:13:16.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1574 -- author: ReeZii - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u0435\ - \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0441\u043B\ - \u0435\u0434\u0438\u0442\u044C \u0437\u0430 \u0440\u0435\u0432\u0435\u043D\u0430\ - \u043D\u0442\u043E\u043C" - type: Fix - id: 374 - time: '2024-08-13T13:57:48.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1576 - author: ReeZii changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u043E\u0434\ @@ -6132,3 +5855,287 @@ id: 853 time: '2025-03-03T21:15:24.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2596 +- author: ReeZii + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0447\u0435\u043C\u043E\ + \u0434\u0430\u043D \u0441 \u0434\u0432\u043E\u0439\u043D\u044B\u043C \u0434\u043D\ + \u043E\u043C \u0432 \u0410\u043F\u043B\u0438\u043D\u043A \u043F\u0440\u0435\u0434\ + \u0430\u0442\u0435\u043B\u044E. \u041E\u043D \u0432\u043C\u0435\u0449\u0430\u0435\ + \u0442 \u0432 \u0441\u0435\u0431\u044F \u043B\u044E\u0431\u043E\u0435 \u043E\ + \u0440\u0443\u0436\u0438\u0435 \u0434\u0430\u043B\u044C\u043D\u0435\u0433\u043E\ + \ \u0431\u043E\u044F. \u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C\ + \ 2 \u0422\u041A" + type: Add + id: 854 + time: '2025-03-04T05:13:49.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2642 +- author: okroshka59, Gnomeev + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ + \u0439\u0442\u044B \u0432\u0441\u0435\u0445 \u0440\u0435\u0432\u043E\u043B\u044C\ + \u0432\u0435\u0440\u043E\u0432!" + type: Tweak + id: 855 + time: '2025-03-05T16:31:30.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2649 +- author: AlwyAnri + changes: + - message: "\u041F\u043E\u0434\u0442\u044F\u043D\u0443\u0442\u044B \u0438\u0441\u043F\ + \u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u0431\u0430\u0433\u043E\u0432\ + \ UI \u0445\u0440\u0430\u043D\u0438\u043B\u0438\u0449" + type: Fix + id: 856 + time: '2025-03-05T16:34:33.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2652 +- author: Kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A\u0440\u0435\u043F\u0438\ + \u0442\u044C \u0441\u0442\u0430\u043D\u0431\u0430\u0442\u043E\u043D, \u0430\u043F\ + \u0442\u0435\u0447\u043A\u0438 \u0438 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\ + \u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435 \u043D\u0430 \u0420\u041F\u0421\ + \ \u0421\u0429." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0440\u0430\u0446\ + \u0438\u044F \u043E\u0445\u0440\u0430\u043D\u044B \u0421\u0429\u0443." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u044D\u043D\u0435\ + \u0440\u0433\u043E\u044F\u0447\u0435\u0439\u043A\u0430 \u0432 \u04221 \u0442\ + \u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044E \"\u043F\u0440\u043E\u0434\ + \u0432\u0438\u043D\u0443\u0442\u044B\u0435 \u0431\u0430\u0442\u0430\u0440\u0435\ + \u0438\"." + type: Add + - message: "\u041D\u0435\u043C\u043D\u043E\u0433\u043E \u0443\u0432\u0435\u043B\u0438\ + \u0447\u0435\u043D \u0440\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u044F\u0441\ + \u0430 \u0421\u0429." + type: Tweak + - message: "\u042D\u043D\u0435\u0440\u0433\u043E\u044F\u0447\u0435\u0439\u043A\u0443\ + \ \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u043F\ + \u043E\u043B\u043E\u0436\u0438\u0442\u044C \u0432 \u043F\u043E\u044F\u0441\u044B\ + \ \u0421\u0429 \u0438 \u0421\u0411." + type: Tweak + id: 857 + time: '2025-03-06T05:16:38.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2656 +- author: anders0n + changes: + - message: "\u0428\u0430\u0440\u0444\u044B \u0441\u0438\u043D\u0434\u0438\u043A\u0430\ + \u0442\u0430 \u0432 \u0430\u0441\u0441\u043E\u0440\u0442\u0438\u043C\u0435\u043D\ + \u0442\u0430\u0445 \u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u0442\u0435\u043F\ + \u0435\u0440\u044C \u0431\u0435\u0441\u043F\u043B\u0430\u0442\u043D\u044B\u0435\ + !" + type: Tweak + id: 858 + time: '2025-03-06T09:38:06.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2657 +- author: anders0n + changes: + - message: "\u0438\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043E\u0441\u0442\u0430\ + \u0432 \u0432\u0435\u0449\u0435\u0441\u0442\u0432\u0430 \u0432 \u0438\u043C\u043F\ + \u043B\u0430\u043D\u0442\u0435 \u0410\u0434\u0440\u0435\u043D\u0430\u043B\u0438\ + \u043D\u0430. \u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438 \u043A\ + \u0430\u0436\u0434\u043E\u043C \u043D\u0430\u0436\u0430\u0442\u0438\u0438 \u0432\ + \u0432\u043E\u0434\u044F\u0442\u0441\u044F:" + type: Tweak + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\ + \u0435\u043B\u044C\u0435!" + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\ + \u0435!" + type: Remove + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u0432\u0435\u0441\u0435\ + \u043B\u044C\u0435!" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\ + \u0441\u0435\u043B\u044C\u0435!" + type: Fix + id: 859 + time: '2025-03-06T22:55:15.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2661 +- author: Kemran + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043F\u0430\u043B\u0438\ + \u0442\u0440\u0430 \u0438\u043A\u043E\u043D\u043A\u0438 \u0441\u0435\u0440\u0432\ + \u0438\u0441\u043D\u043E\u0433\u043E \u0430\u0434\u043C\u0438\u043D\u0438\u0441\ + \u0442\u0440\u0430\u0442\u043E\u0440\u0430. \u0422\u0435\u043F\u0435\u0440\u044C\ + \ \u043E\u043D\u0430 \u0442\u0430\u043A\u0430\u044F \u0436\u0435, \u043A\u0430\ + \u043A \u0438 \u0443 \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u0445." + type: Tweak + id: 860 + time: '2025-03-06T22:57:01.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2662 +- author: Kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0440\u0430\ + \u0439\u0442 \u0432 \u0434\u0432\u0443\u0445 \u0440\u0443\u043A\u0430\u0445\ + \ \u0434\u043B\u044F m-90gl." + type: Add + id: 861 + time: '2025-03-06T23:02:33.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2669 +- author: Kemran + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0441\u043E \u0441\u043F\u0440\u0430\u0439\u0442\u0430\u043C\u0438 \u043C\ + \u043E\u0434\u0443\u043B\u044C\u043D\u043E\u0439 \u0433\u0440\u0430\u043D\u0430\ + \u0442\u044B." + type: Fix + id: 862 + time: '2025-03-06T23:03:20.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2666 +- author: Kemran + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0440\u0430\u0439\ + \u0442 \u0411\u0443\u0445\u043B\u043E\u041C\u0430\u0442\u0430 \u0432 \u0441\u043E\ + \u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441 \u0410\u043B\ + \u043A\u043E\u041C\u0430\u0442\u043E\u043C!" + type: Tweak + id: 863 + time: '2025-03-06T23:01:59.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2663 +- author: Abubben, Kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u043A\u0430\u0444\ + \u0430\u043D\u0434\u0440 \u0426\u0435\u043D\u0442\u0440\u0430\u043B\u044C\u043D\ + \u043E\u0433\u043E \u041A\u043E\u043C\u0430\u043D\u0434\u043E\u0432\u0430\u043D\ + \u0438\u044F." + type: Add + id: 864 + time: '2025-03-06T23:04:47.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2667 +- author: NightmareStalker + changes: + - message: "\u0410\u0432\u0430\u043D\u043F\u043E\u0441\u0442\u0430 \u042F\u041E\ + : \u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u043B\u0435\ + \u0442\u043D\u0435\u0433\u043E \u0441\u0435\u0437\u043E\u043D\u044F" + type: Tweak + - message: "\u0410\u0432\u0430\u043D\u043F\u043E\u0441\u0442\u0430 \u042F\u041E\ + : \u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0442\u0440\u0430\u0432\u0430\ + \ \u0432\u043E \u0434\u0432\u043E\u0440\u0435-\u0442\u0438\u0440\u0435" + type: Tweak + id: 865 + time: '2025-03-07T08:21:40.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2655 +- author: NightmareStalker + changes: + - message: "Axioma: \u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\ + \u0430\u0437\u0432\u0430\u043D\u0438\u044F \u043A\u0430\u043C\u0435\u0440\u0430\ + \u043C \u0434\u043B\u044F \u0443\u0434\u043E\u0431\u0441\u0442\u0432\u0430 \u0438\ + \u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044F \u0438\ + \ \u043E\u0440\u0438\u0435\u043D\u0442\u0438\u0440\u043E\u0432\u043A\u0438 \u0432\ + \ \u043A\u043E\u043D\u0441\u043E\u043B\u0438" + type: Add + - message: "Axioma: \u041F\u043E\u043A\u0440\u0430\u0441\u043E\u0447\u043D\u044B\ + \u0439 \u0430\u043F\u043F\u0430\u0440\u0430\u0442 \u0434\u043E\u0431\u0430\u0432\ + \u043B\u0435\u043D \u043A \u0413\u041F, \u0430 \u0443 \u043C\u0430\u0433\u0438\ + \u0441\u0442\u0440\u0430\u0442\u0430 \u043F\u043E\u044F\u0432\u0438\u043B\u0441\ + \u044F \u0441\u0432\u043E\u0439 \u0433\u043E\u043B\u043E\u043F\u0430\u0434" + type: Add + - message: "Axioma: \u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0438\ + \u0435 \u043B\u0435\u0442\u043D\u0435\u0433\u043E \u0441\u0435\u0437\u043E\u043D\ + \u0430" + type: Tweak + id: 866 + time: '2025-03-07T08:24:23.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2654 +- author: Kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0443\u043C\u0430\ + \u0436\u043D\u044B\u0439 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0438\u043A\ + . \u0415\u0433\u043E \u043C\u043E\u0436\u043D\u043E \u0441\u043E\u0437\u0434\ + \u0430\u0442\u044C \u0438\u0437 \u043B\u0438\u0441\u0442\u0430 \u0431\u0443\u043C\ + \u0430\u0433\u0438!" + type: Add + id: 867 + time: '2025-03-07T08:27:05.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2668 +- author: Kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0435\u0440\u0435\ + \u0442 \u0430\u0433\u0435\u043D\u0442\u0430 \u0432\u043D\u0443\u0442\u0440\u0435\ + \u043D\u043D\u0438\u0445 \u0434\u0435\u043B." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0448\u043B\u0435\u043C\ + \ \u0443\u043B\u0438\u0447\u043D\u043E\u0433\u043E \u0441\u0443\u0434\u044C\u0438\ + \ (\u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442 - 100\u0447)." + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0440\u0430\u0439\ + \u0442 \u0441\u0443\u0434\u0435\u0439\u0441\u043A\u043E\u0439 \u043C\u0430\u043D\ + \u0442\u0438\u0438." + type: Tweak + id: 868 + time: '2025-03-07T08:42:22.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2658 +- author: Gnomeev New Balance + changes: + - message: "\u0420\u0435\u0439\u0434\u0435\u0440\u0441\u043A\u0430\u044F \u0431\u0440\ + \u043E\u043D\u044F \u0443\u0431\u0440\u0430\u043D\u0430 \u0438\u0437 \u0430\u043F\ + \u043B\u0438\u043D\u043A\u0430 \u0430\u0433\u0435\u043D\u0442\u043E\u0432!" + type: Remove + id: 869 + time: '2025-03-08T20:16:17.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2646 +- author: Werzet, WhereMyTea, UrPrice + changes: + - message: "\u041F\u0435\u0440\u0435\u0441\u043C\u043E\u0442\u0440\u0435\u043D\u044B\ + \ \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0446\u0435\u043D\u044B\ + \ \u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435." + type: Tweak + id: 870 + time: '2025-03-08T20:17:59.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2659 +- author: Lancevrot, UrPrice + changes: + - message: "\u041F\u043E\u0432\u044B\u0448\u0435\u043D\u0430 \u0432\u044B\u0436\u0438\ + \u0432\u0430\u0435\u043C\u043E\u0441\u0442\u044C \u043C\u0438\u0434\u0440\u0430\ + \u0443\u043D\u0434 \u0430\u043D\u0442\u0430\u0433\u043E\u0432 \u0438 \u0437\u043E\ + \u043C\u0431\u0438." + type: Tweak + - message: "\u0422\u0430\u044F\u0440\u044B, \u041D\u0438\u0430\u043D\u044B \u0438\ + \ \u0414\u0438\u043E\u043D\u044B \u043F\u043E\u043B\u0443\u0447\u0430\u044E\u0442\ + \ \u043C\u0435\u043D\u044C\u0448\u0435 \u0431\u043E\u043D\u0443\u0441\u043D\u043E\ + \u0433\u043E \u0443\u0440\u043E\u043D\u0430 \u043E\u0442 \u043B\u0430\u0437\u0435\ + \u0440\u043E\u0432." + type: Tweak + id: 871 + time: '2025-03-09T05:22:54.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2137 +- author: Lancevrot + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0442\u0440\u0435\ + \u0431\u043E\u0432\u0430\u043D\u0438\u0435 \u043A \u0438\u0433\u0440\u043E\u0432\ + \u043E\u043C\u0443 \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u043D\u0430 \u043C\ + \u0438\u0434\u0440\u0430\u0443\u043D\u0434 \u0433\u043E\u0441\u0442\u0440\u043E\ + \u043B\u0438." + type: Add + id: 872 + time: '2025-03-09T06:04:19.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2481 +- author: Kemran + changes: + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u0441\u0435 \u0438\u043C\ + \u043F\u043B\u0430\u043D\u0442\u044B \u043F\u043E\u0441\u0442\u0430\u0432\u043B\ + \u044F\u044E\u0442\u0441\u044F \u0432 \u0437\u0430\u0449\u0438\u0449\u0435\u043D\ + \u043D\u044B\u0445 \u043C\u0435\u0434\u0438\u0446\u0438\u043D\u0441\u043A\u0438\ + \u0445 \u044F\u0449\u0438\u043A\u0430\u0445 \u0441 \u0434\u043E\u0441\u0442\u0443\ + \u043F\u0430\u043C\u0438: \u041C\u0435\u0434\u0438\u0446\u0438\u043D\u0441\u043A\ + \u0438\u0439, \u0421\u043B\u0443\u0436\u0431\u0430 \u0411\u0435\u0437\u043E\u043F\ + \u0430\u0441\u043D\u043E\u0441\u0442\u0438, \u041A\u043E\u043C\u0430\u043D\u0434\ + \u043E\u0432\u0430\u043D\u0438\u0435" + type: Tweak + id: 873 + time: '2025-03-09T06:13:45.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2671 +- author: dinazewwr, kemran + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043C\u043E\u043D\u043E\ + \u043A\u043B\u044C." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043C\u043E\u043D\u043E\ + \u043A\u043B\u044C \u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442\u0443\ + \ \u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u0440\u044E\ + \ \u0437\u0430 20\u0447." + type: Add + id: 874 + time: '2025-03-09T09:58:10.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2665 diff --git a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl index 634107d3347d..2d4626109e17 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl @@ -1,6 +1,13 @@ ent-ClothingBackpackArmy = армейский ранец .desc = Твердый ранец с спальным мешком. Помогает пережить длительные марши. + ent-ClothingBackpackBlueShield = рюкзак "Синий Щит" .desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра. -ent-ClothingBackpackBlueShieldHight = рюкзак "Синий Щит" - .desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра. + .suffix = Лёгкий скафандр + +ent-ClothingBackpackBlueShieldHight = { ent-ClothingBackpackBlueShield } + .desc = { ent-ClothingBackpackBlueShield.desc } + .suffix = Тяжелый скафандр +ent-ClothingBackpackBlueShieldHightFilled = { ent-ClothingBackpackBlueShield } + .suffix = Тяжелый скафандр, заполненный + .desc = { ent-ClothingBackpackBlueShield.desc } diff --git a/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl b/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl index 07d46bf32d99..eadc72eda202 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl @@ -16,8 +16,8 @@ ent-ClothingBeltBlueShieldFilled = { ent-ClothingBeltBlueShield } ent-ClothingBeltWebbingBlueShield = РПС "Синий Щит" .desc = Универсальный разгрузочный жилет с ремнями и поясом. Может вмещать всё что угодно... всё что угодно небольшого размера. -ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltBlueShield } - .desc = { ent-ClothingBeltBlueShield.desc } +ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltWebbingBlueShield } + .desc = { ent-ClothingBeltWebbingBlueShield.desc } .suffix = Заполненный ent-ClothingBeltMedicalInterdyne = РПС образца НМП-023 diff --git a/Resources/Locale/ru-RU/ss220/clothing/Eyes/specific.ftl b/Resources/Locale/ru-RU/ss220/clothing/Eyes/specific.ftl new file mode 100644 index 000000000000..91e07527a16f --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Eyes/specific.ftl @@ -0,0 +1,4 @@ +ent-ClothingEyesMonocle = монокль + .desc = Аксессуар, подчеркивающий утонченность и изысканность, символ элегантности и внимания к деталям. +ent-ClothingEyesMonocleFlipped = монокль + .desc = Аксессуар, подчеркивающий утонченность и изысканность, символ элегантности и внимания к деталям. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl index 2099ff0aa8a2..ffc35e16510d 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl @@ -6,3 +6,6 @@ ent-ClothingHeadHelmetHardsuitDeathsquadCommander = шлем командира ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = шлем специалиста Эскадрона Смерти .suffix = Эскадрон Смерти, dq .desc = Шлем от костюм специалиста Эскадрона Смерти. + +ent-ClothingHeadHelmetHardsuitCentcom = шлем скафандра Центрального Командования + .desc = Сочетание непоколебимой защиты и передовых технологий, воплощение мощи и стратегического превосходства. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl index 386b3d7b704b..e84dc6b7e2a8 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl @@ -63,3 +63,8 @@ ent-ClothingHeadHatNewYearsCap = новогодний колпак .desc = Яркий новогодний колпак с пушистым помпоном, добавляющий волшебства и праздничного настроения! ent-ClothingHeadHatBeretExplorer = берет исследователя .desc = Берет специально для исследователя. +ent-ClothingHeadHatBeretIAA = берет агента внутренних дел + .desc = Берет для достойнейших... но почему он синий? +ent-ClothingHeadHatStreetJudge = шлем уличного судьи + .desc = Твоя голова должна внушать страх и выносить приговоры на асфальте. + .suffix = За время в игре diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl index 7c09f04361cb..7ea441ae2e2b 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl @@ -9,3 +9,6 @@ ent-ClothingOuterHardsuitDeathsquadCommander = скафандр командир ent-ClothingOuterHardsuitDeathsquadAlpha = скафандр специалиста Эскадрона Смерти .suffix = Эскадрон Смерти, dq .desc = Высокотехнологичный скафандр, предназначенный для специалистов отряда. + +ent-ClothingOuterHardsuitCentcom = скафандр Центрального Командования + .desc = Сочетание непоколебимой защиты и передовых технологий, воплощение мощи и стратегического превосходства. diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/librarian.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/librarian.ftl new file mode 100644 index 000000000000..c22fe205d6c0 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/librarian.ftl @@ -0,0 +1 @@ +loadout-group-librarian-eyes = Библиотекарь, очки diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/magistrate.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/magistrate.ftl index c398bc9ade58..e67785c476e6 100644 --- a/Resources/Locale/ru-RU/ss220/loadout-groups/magistrate.ftl +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/magistrate.ftl @@ -2,3 +2,4 @@ loadout-group-magistrate-head = Магистрат, голова loadout-group-magistrate-jumpsuit = Магистрат, комбинезон loadout-group-magistrate-outerclothing = Магистрат, верхняя одежда loadout-group-magistrate-headset = Магистрат, гарнитура +loadout-group-magistrate-eyes = Магистрат, очки diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items/briefcases.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items/briefcases.ftl index 1a317246a784..bf0f9ffe11d4 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items/briefcases.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items/briefcases.ftl @@ -1,3 +1,9 @@ ent-BriefcaseSyndieSniperToyBundleFilled = { bounty-item-briefcase } .suffix = Игрушечный, Христов .desc = { ent-BriefcaseSyndie.desc } + +ent-BriefcaseHiddenSlot = { bounty-item-briefcase } + .suffix = Двойное дно, Пустой + .desc = { ent-BriefcaseSyndie.desc } + +switch-toggle-item-slots-examine-open = [color=red]Вы замечаете, что в дне чемодана открыт скрытый отсек.[/color] diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/misc/paper.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/misc/paper.ftl new file mode 100644 index 000000000000..801bc64befee --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/misc/paper.ftl @@ -0,0 +1,2 @@ +ent-PaperAirplane = бумажный самолетик + .desc = Игрушечный самолёт, сделанный из бумаги. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl index f842af3fb8ac..52d96a4addab 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -18,10 +18,13 @@ ent-WeaponBlasterKRV = krv .desc = Усовершенствованная бластерная винтовка. Используется особенными оперативниками. .suffix = Бластер -ent-BlasterPowerCellAlt= бластерная энергоячейка +ent-BlasterPowerCellAlt = бластерная энергоячейка .desc = Вмещает в себе гораздо больше боли, чем вы когда-либо мечтали. +ent-BlasterPowerCellAltPrinted = бластерная энергоячейка + .desc = Вмещает в себе гораздо больше боли, чем вы когда-либо мечтали. + .suffix = Пустой -ent-BlasterPowerCellDisabler= бластерная энергоячейка (disabler) +ent-BlasterPowerCellDisabler = бластерная энергоячейка (disabler) .desc = Вмещает в себе гораздо больше боли, чем вы когда-либо мечтали. ent-BlasterPowerCellPulse = усовершенствованная бластерная энергоячейка diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/storage/crates/crates.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/storage/crates/crates.ftl new file mode 100644 index 000000000000..e11c4df0e925 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/storage/crates/crates.ftl @@ -0,0 +1,2 @@ +ent-CrateMedicalSecureImplant = { ent-CrateBaseSecure } + .desc = { ent-CrateBaseSecure.desc } diff --git a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl index f14ac25b444e..ffd60810bd1b 100644 --- a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl @@ -2,11 +2,14 @@ uplink-ecrossbow-name = { ent-WeaponMiniEnergyCrossbow } uplink-ecrossbow-desc = { ent-WeaponMiniEnergyCrossbow.desc } -#Misc +# Misc uplink-clothing-eyes-hud-syndicate-agent-name = Визор агента Синдиката uplink-clothing-eyes-hud-syndicate-agent-desc = Продвинутый визор Синдиката с индикатором на стекле, предназначенный для более точного обнаружения гуманоидов с их последующим уничтожением. Способен опеределять уровень здоровья гуманоидов и киборгов. +uplink-clothing-briefcase-with-double-bottom-name = Чемодан с двойным дном +uplink-clothing-briefcase-with-double-bottom-desc = Чемодан с двойным дном, которое может быть открыто отвёрткой. Вмещает в себя одно огнестрельное оружие. + # Disruption uplink-syndicate-pen-signaller = Ручка-передатчик @@ -19,7 +22,7 @@ uplink-mindslave-implanter-desc = { ent-MindSlaveImplant.desc } uplink-mindslave-fix-surgery-bundle-name = Конфигуратор подчинителя разума uplink-mindslave-fix-surgery-bundle-desc = Позволяет вашим подчинённым прожить дольше, требует вмешательства каждый раз при возникновении проблем. Идёт вместе с хирургическим набором и инструкцией! -#JobItems +# JobItems uplink-mime-relic-name = { ent-SacredRelicMime } uplink-mime-relic-desc = Ценная реликвия Ордена Тишины, Вашего ордена. Зажав в руке, позволяет мимам поставить сразу три невидимые стены, закрывающие широкий проход, раз в 90 секунд. @@ -30,7 +33,7 @@ uplink-fake-ops-desc = Набор высококачественных репл uplink-expensive-lighter-name = { ent-ExpensiveLighterSyndicate } uplink-expensive-lighter-desc = { ent-ExpensiveLighterSyndicate.desc } - #Masks-Boxes +# Masks-Boxes uplink-special-delivery-name = Особая посылка uplink-special-delivery-desc = Содержит случайную маску животного, что некогда носили майамские психи. diff --git a/Resources/Maps/SS220/axioma.yml b/Resources/Maps/SS220/axioma.yml index beb2a14e141d..75183e6a9663 100644 --- a/Resources/Maps/SS220/axioma.yml +++ b/Resources/Maps/SS220/axioma.yml @@ -98193,6 +98193,14 @@ entities: - type: Transform pos: -74.32765,-37.103577 parent: 2 +- proto: ClothingMaskBlushingMime + entities: + - uid: 14348 + components: + - type: Transform + parent: 14342 + - type: Physics + canCollide: False - proto: ClothingMaskBreath entities: - uid: 14491 @@ -98437,14 +98445,6 @@ entities: parent: 14342 - type: Physics canCollide: False -- proto: ClothingMaskSexyMime - entities: - - uid: 14348 - components: - - type: Transform - parent: 14342 - - type: Physics - canCollide: False - proto: ClothingMaskSterile entities: - uid: 14240 @@ -101268,6 +101268,13 @@ entities: - type: Transform pos: 3.5,1.5 parent: 2 +- proto: ComputerPdaIdPainter + entities: + - uid: 28533 + components: + - type: Transform + pos: -15.5,-11.5 + parent: 2 - proto: ComputerPowerMonitoring entities: - uid: 14914 @@ -118820,7 +118827,7 @@ entities: pos: 33.5,-93.5 parent: 2 - type: Door - secondsUntilStateChange: -919144.56 + secondsUntilStateChange: -919430.56 state: Closing - uid: 17643 components: @@ -122964,7 +122971,7 @@ entities: pos: 43.5,-95.5 parent: 2 - type: Door - secondsUntilStateChange: -737202.4 + secondsUntilStateChange: -737488.4 state: Closing - uid: 18050 components: @@ -122973,7 +122980,7 @@ entities: pos: 43.5,-94.5 parent: 2 - type: Door - secondsUntilStateChange: -737203.7 + secondsUntilStateChange: -737489.7 state: Closing - uid: 18051 components: @@ -122982,7 +122989,7 @@ entities: pos: 43.5,-93.5 parent: 2 - type: Door - secondsUntilStateChange: -737204.94 + secondsUntilStateChange: -737490.94 state: Closing - uid: 18052 components: @@ -122990,7 +122997,7 @@ entities: pos: 60.5,-82.5 parent: 2 - type: Door - secondsUntilStateChange: -737182.4 + secondsUntilStateChange: -737468.4 state: Closing - uid: 18053 components: @@ -122998,7 +123005,7 @@ entities: pos: 61.5,-82.5 parent: 2 - type: Door - secondsUntilStateChange: -737181.56 + secondsUntilStateChange: -737467.56 state: Closing - uid: 18054 components: @@ -179622,6 +179629,15 @@ entities: - type: Transform pos: -64.342285,30.664528 parent: 2 +- proto: Holopad + entities: + - uid: 14640 + components: + - type: Transform + pos: 29.5,-14.5 + parent: 2 + - type: Label + currentLabel: Юридический - Магистрат - proto: HolopadAiBackupPower entities: - uid: 26092 @@ -196475,446 +196491,6 @@ entities: - type: Transform pos: -70.5,-36.5 parent: 2 -- proto: PresentRandom - entities: - - uid: 28533 - components: - - type: Transform - pos: -92.5,-23.5 - parent: 2 - - uid: 28534 - components: - - type: Transform - pos: -90.5,-21.5 - parent: 2 - - uid: 28536 - components: - - type: Transform - parent: 28535 - - type: Physics - canCollide: False - - uid: 28537 - components: - - type: Transform - pos: -54.51943,-110.50764 - parent: 2 - - uid: 28538 - components: - - type: Transform - pos: -31.540087,-93.98768 - parent: 2 - - uid: 28539 - components: - - type: Transform - pos: -31.735083,-93.80018 - parent: 2 - - uid: 28540 - components: - - type: Transform - pos: -55.65814,-51.313915 - parent: 2 - - uid: 28541 - components: - - type: Transform - pos: -54.205013,-51.188915 - parent: 2 - - uid: 28542 - components: - - type: Transform - pos: -53.267513,-51.23579 - parent: 2 - - uid: 28543 - components: - - type: Transform - pos: -53.34564,-52.532665 - parent: 2 - - uid: 28544 - components: - - type: Transform - pos: -55.25189,-52.501415 - parent: 2 - - uid: 28545 - components: - - type: Transform - pos: -65.623276,-51.382427 - parent: 2 - - uid: 28546 - components: - - type: Transform - pos: -65.0764,-51.241802 - parent: 2 - - uid: 28547 - components: - - type: Transform - pos: -94.72908,-38.517296 - parent: 2 - - uid: 28548 - components: - - type: Transform - pos: -96.682205,-40.111046 - parent: 2 - - uid: 28549 - components: - - type: Transform - pos: -47.681206,-7.231126 - parent: 2 - - uid: 28550 - components: - - type: Transform - pos: -48.3145,-15.239942 - parent: 2 - - uid: 28551 - components: - - type: Transform - pos: -59.332264,-28.388699 - parent: 2 - - uid: 28552 - components: - - type: Transform - pos: -63.715652,16.110682 - parent: 2 - - uid: 28553 - components: - - type: Transform - pos: -50.49932,16.44693 - parent: 2 - - uid: 28554 - components: - - type: Transform - pos: -55.544373,-1.3546368 - parent: 2 - - uid: 28555 - components: - - type: Transform - pos: -60.62152,-8.330092 - parent: 2 - - uid: 28556 - components: - - type: Transform - pos: -16.624851,-20.396877 - parent: 2 - - uid: 28557 - components: - - type: Transform - pos: 9.605426,-14.2160845 - parent: 2 - - uid: 28558 - components: - - type: Transform - pos: 65.42522,-44.434246 - parent: 2 - - uid: 28559 - components: - - type: Transform - pos: 27.438818,-98.46995 - parent: 2 - - uid: 28560 - components: - - type: Transform - pos: 36.717518,-79.13893 - parent: 2 - - uid: 28561 - components: - - type: Transform - pos: 38.248768,-79.21706 - parent: 2 - - uid: 28562 - components: - - type: Transform - pos: 42.767548,-75.1473 - parent: 2 - - uid: 28563 - components: - - type: Transform - pos: 73.2821,4.808789 - parent: 2 - - uid: 28564 - components: - - type: Transform - pos: 1.6313889,-14.406442 - parent: 2 - - uid: 28565 - components: - - type: Transform - pos: -19.739012,-62.41834 - parent: 2 - - uid: 28566 - components: - - type: Transform - pos: -8.550503,-82.56984 - parent: 2 - - uid: 28567 - components: - - type: Transform - pos: -11.89113,-98.36532 - parent: 2 - - uid: 28568 - components: - - type: Transform - pos: -49.533,-69.495224 - parent: 2 - - uid: 28569 - components: - - type: Transform - pos: -112.502754,-0.51365876 - parent: 2 - - uid: 28570 - components: - - type: Transform - pos: -93.52491,26.49739 - parent: 2 - - uid: 28571 - components: - - type: Transform - pos: -82.749596,46.557976 - parent: 2 - - uid: 28572 - components: - - type: Transform - pos: -4.5355897,47.8374 - parent: 2 - - uid: 28573 - components: - - type: Transform - pos: -4.840277,47.18115 - parent: 2 - - uid: 28574 - components: - - type: Transform - pos: -2.5434024,46.384274 - parent: 2 - - uid: 28575 - components: - - type: Transform - pos: -2.3238475,-21.400345 - parent: 2 - - uid: 28576 - components: - - type: Transform - pos: -2.6050975,-21.892532 - parent: 2 - - uid: 28577 - components: - - type: Transform - pos: -4.55041,-21.54097 - parent: 2 - - uid: 28578 - components: - - type: Transform - pos: 32.71695,-62.53698 - parent: 2 - - uid: 28579 - components: - - type: Transform - pos: -24.064493,-96.393005 - parent: 2 - - uid: 28580 - components: - - type: Transform - pos: -26.857853,-66.25562 - parent: 2 - - uid: 28581 - components: - - type: Transform - pos: -29.333149,-53.979958 - parent: 2 - - uid: 28582 - components: - - type: Transform - pos: -60.5,-56.5 - parent: 2 - - uid: 28583 - components: - - type: Transform - pos: -42.5,-57.5 - parent: 2 - - uid: 28584 - components: - - type: Transform - pos: -62.5,-60.5 - parent: 2 - - uid: 28585 - components: - - type: MetaData - desc: Маленькая коробочка с невероятными сюрпризами внутри. Кто знает, может, там будет его утерянный топор? - name: подарок Даки-Даки - - type: Transform - pos: -60.955593,-38.690098 - parent: 2 - - uid: 28586 - components: - - type: Transform - pos: -40.50066,-48.53743 - parent: 2 - - uid: 28588 - components: - - type: Transform - parent: 28587 - - type: Physics - canCollide: False - - uid: 28589 - components: - - type: Transform - pos: -7.857493,-31.202103 - parent: 2 - - uid: 28590 - components: - - type: Transform - pos: 1.0175073,-31.452103 - parent: 2 - - uid: 28591 - components: - - type: Transform - pos: -32.997395,-1.4756596 - parent: 2 - - uid: 28592 - components: - - type: Transform - pos: -31.371586,-14.447138 - parent: 2 - - uid: 28593 - components: - - type: Transform - pos: -36.9801,-82.798164 - parent: 2 - - uid: 28594 - components: - - type: Transform - pos: -36.276974,-82.985664 - parent: 2 - - uid: 28595 - components: - - type: Transform - pos: 47.574318,-60.307865 - parent: 2 - - uid: 28596 - components: - - type: Transform - pos: 35.33821,-42.207897 - parent: 2 - - uid: 28597 - components: - - type: Transform - pos: 2.292786,30.481457 - parent: 2 -- proto: PresentRandomCash - entities: - - uid: 28598 - components: - - type: Transform - pos: -92.5,-21.5 - parent: 2 - - uid: 28600 - components: - - type: Transform - parent: 28599 - - type: Physics - canCollide: False - - uid: 28602 - components: - - type: Transform - pos: -69.34199,-49.358643 - parent: 2 - - uid: 28603 - components: - - type: Transform - pos: -24.30529,-6.1647644 - parent: 2 -- proto: PresentRandomUnsafe - entities: - - uid: 14640 - components: - - type: Transform - parent: 14638 - - type: Physics - canCollide: False - - uid: 28604 - components: - - type: Transform - pos: -90.5,-23.5 - parent: 2 - - uid: 28605 - components: - - type: Transform - pos: -39.47759,-89.98768 - parent: 2 - - uid: 28606 - components: - - type: Transform - pos: -26.230864,-66.77028 - parent: 2 - - uid: 28607 - components: - - type: Transform - pos: -48.673763,-54.907665 - parent: 2 - - uid: 28608 - components: - - type: Transform - pos: -48.361263,-54.42329 - parent: 2 - - uid: 28609 - components: - - type: Transform - pos: -69.66618,-48.874947 - parent: 2 - - uid: 28610 - components: - - type: Transform - pos: -60.404526,-51.382427 - parent: 2 - - uid: 28611 - components: - - type: Transform - pos: 66.47021,-60.327854 - parent: 2 - - uid: 28612 - components: - - type: Transform - pos: 61.274323,-51.504864 - parent: 2 - - uid: 28613 - components: - - type: Transform - pos: 59.480423,-63.57438 - parent: 2 - - uid: 28614 - components: - - type: Transform - pos: 60.505505,-96.09514 - parent: 2 - - uid: 28615 - components: - - type: Transform - pos: -83.7416,-37.311954 - parent: 2 - - uid: 28616 - components: - - type: Transform - pos: -53.49134,-39.568596 - parent: 2 - - uid: 28617 - components: - - type: Transform - pos: -55.49134,-45.55297 - parent: 2 - - uid: 28619 - components: - - type: Transform - parent: 28618 - - type: Physics - canCollide: False - - uid: 28621 - components: - - type: Transform - parent: 28620 - - type: Physics - canCollide: False - - uid: 28622 - components: - - type: Transform - pos: -28.338268,-72.70424 - parent: 2 - proto: Protolathe entities: - uid: 28623 @@ -226371,40 +225947,19 @@ entities: disposals: !type:Container showEnts: False occludes: True - ents: - - 14640 + ents: [] - uid: 28535 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-68.5 parent: 2 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot - showEnts: False - occludes: True - ent: 28536 - disposals: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 28587 components: - type: Transform rot: 3.141592653589793 rad pos: 42.5,-43.5 parent: 2 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot - showEnts: False - occludes: True - ent: 28588 - disposals: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 28599 components: - type: Transform @@ -226422,39 +225977,18 @@ entities: disposals: !type:Container showEnts: False occludes: True - ents: - - 28600 + ents: [] - uid: 28618 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,-43.5 parent: 2 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot - showEnts: False - occludes: True - ent: 28619 - disposals: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 28620 components: - type: Transform pos: 58.5,-59.5 parent: 2 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot - showEnts: False - occludes: True - ent: 28621 - disposals: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 33943 components: - type: Transform diff --git a/Resources/Maps/SS220/ss220-nukeoutpost.yml b/Resources/Maps/SS220/ss220-nukeoutpost.yml index 57fc964be66d..311e9e274da8 100644 --- a/Resources/Maps/SS220/ss220-nukeoutpost.yml +++ b/Resources/Maps/SS220/ss220-nukeoutpost.yml @@ -8706,6 +8706,8 @@ entities: - EnergySword - ItemToggleSize - UseDelay + - Blocking + - Reflect - proto: ExpensiveLighterSyndicate entities: - uid: 960 @@ -13069,16 +13071,13 @@ entities: - type: Transform pos: -5.5,22.5 parent: 2 -- proto: VendingMachineBooze +- proto: VendingMachineBoozeSyndicate entities: - uid: 1647 components: - type: Transform pos: 7.5,-6.5 parent: 2 - - type: AccessReader - access: - - - NuclearOperative - proto: VendingMachineChemicalsSyndicate entities: - uid: 1648 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index 3a7e0680c45e..04e1e15eb80f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -28,7 +28,7 @@ - type: entity id: CrateTrackingImplants - parent: [ CrateWeaponSecure] + parent: [ CrateMedicalSecureImplant ] #SS220 The implants are in new crates name: tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 31b2743f441c..c9496e6d44b7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -219,7 +219,7 @@ - type: entity id: CrateFunSadTromboneImplants - parent: CrateGenericSteel + parent: [ CrateMedicalSecureImplant ] #SS220 The implants are in new crates name: sad trombone implants description: Death's never been so fun before! Implant these to make dying a bit more happy. components: @@ -230,7 +230,7 @@ - type: entity id: CrateFunLightImplants - parent: CrateGenericSteel + parent: [ CrateMedicalSecureImplant ] #SS220 The implants are in new crates name: light implants description: Light up your skin with these implants! components: @@ -348,7 +348,7 @@ - type: entity id: CrateFunBikeHornImplants - parent: CrateGenericSteel + parent: [ CrateMedicalSecureImplant ] #SS220 The implants are in new crates name: bike horn implants description: A thousand honks a day keeps security officers away! components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index fe04f72899a7..febc447cec23 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -44,7 +44,7 @@ - type: entity id: CrateMindShieldImplants - parent: CrateMedical + parent: [ CrateMedicalSecureImplant ] #SS220 The implants are in new crates name: MindShield implant crate description: Crate filled with 3 MindShield implants. components: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 626d87ba9d02..062d61e35bf9 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -6,11 +6,13 @@ name: uplink-pistol-viper-name description: uplink-pistol-viper-desc productEntity: WeaponPistolViper - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 2 +#ss220-uplink-discounts bgn +# discountCategory: rareDiscounts +# discountDownTo: +# Telecrystal: 2 +#ss220-uplink-discounts end cost: - Telecrystal: 3 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkWeaponry @@ -35,9 +37,9 @@ productEntity: WeaponPistolCobra discountCategory: rareDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkWeaponry @@ -59,10 +61,10 @@ icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon } discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 8 #ss220-uplink-discounts productEntity: EnergySword cost: - Telecrystal: 8 + Telecrystal: 10 #ss220-uplink-discounts categories: - UplinkWeaponry @@ -88,9 +90,9 @@ productEntity: ThrowingKnivesKit discountCategory: rareDiscounts discountDownTo: - Telecrystal: 2 #ss220-uplink-minor-fixes-and-discounts + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 #SS220-underused-uplinks-stuff + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkWeaponry @@ -101,9 +103,9 @@ productEntity: ClothingHandsGlovesNorthStar discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 8 #ss220-uplink-discounts cost: - Telecrystal: 8 + Telecrystal: 10 #ss220-uplink-discounts categories: - UplinkWeaponry @@ -114,12 +116,10 @@ icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon } productEntity: EnergySwordDouble cost: - Telecrystal: 16 - #ss220-uplink-minor-fixes-and-discounts-begin #Discount added for the reason that on the official build d-esword is only in the nukies uplink, but nukies don't have discounts + Telecrystal: 18 #ss220-uplink-discounts discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 9 - #ss220-uplink-minor-fixes-and-discounts-end + Telecrystal: 11 #ss220-uplink-discounts categories: - UplinkWeaponry conditions: @@ -142,9 +142,9 @@ productEntity: ToolboxElectricalTurretFilled discountCategory: usualDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 6 + Telecrystal: 4 #ss220-uplink-discounts categories: - UplinkWeaponry conditions: @@ -316,9 +316,9 @@ productEntity: SyndieMiniBomb discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 4 #ss220-uplink-discounts cost: - Telecrystal: 6 + Telecrystal: 8 #ss220-uplink-discounts categories: - UplinkExplosives @@ -436,9 +436,9 @@ productEntity: ClothingBackpackDuffelSyndicateC4tBundle discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 8 + Telecrystal: 6 #ss220-uplink-discounts cost: - Telecrystal: 12 #you're buying bulk so its a 25% discount, so no additional random discount over it + Telecrystal: 10 #ss220-uplink-discounts categories: - UplinkExplosives @@ -447,11 +447,13 @@ name: uplink-emp-grenade-name description: uplink-emp-grenade-desc productEntity: EmpGrenade - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 1 +#ss220-uplink-discounts bgn +# discountCategory: usualDiscounts +# discountDownTo: +# Telecrystal: 1 +#ss220-uplink-discounts end cost: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkExplosives @@ -463,9 +465,9 @@ productEntity: PenExplodingBox discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkExplosives @@ -655,11 +657,13 @@ description: uplink-hypodart-desc icon: { sprite: /Textures/Objects/Fun/Darts/dart_red.rsi, state: icon } productEntity: HypoDartBox - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 1 +#ss220-uplink-discounts bgn +# discountCategory: veryRareDiscounts +# discountDownTo: +# Telecrystal: 1 +#ss220-uplink-discounts end cost: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkChemicals @@ -671,9 +675,9 @@ productEntity: ChemicalSynthesisKit discountCategory: usualDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 5 # new syndie chemistry update + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkChemicals @@ -705,9 +709,9 @@ productEntity: NocturineChemistryBottle discountCategory: usualDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 6 + Telecrystal: 4 #ss220-uplink-discounts categories: - UplinkChemicals @@ -810,9 +814,9 @@ productEntity: AgentIDCard discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 1 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkDeception @@ -823,9 +827,9 @@ productEntity: StealthBox discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 5 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkDeception @@ -836,9 +840,9 @@ productEntity: ChameleonProjector discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts cost: - Telecrystal: 7 + Telecrystal: 5 #ss220-uplink-discounts categories: - UplinkDeception @@ -907,9 +911,9 @@ productEntity: BriefcaseSyndieLobbyingBundleFilled discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkDeception @@ -971,9 +975,9 @@ productEntity: AccessBreaker discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 5 + Telecrystal: 4 #ss220-uplink-discounts categories: - UplinkDisruption @@ -997,9 +1001,9 @@ productEntity: RadioJammer discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1010,9 +1014,9 @@ productEntity: BorgModuleSyndicateWeapon discountCategory: usualDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 5 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1024,9 +1028,9 @@ icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb } discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1034,9 +1038,14 @@ id: UplinkSoapSyndie name: uplink-soap-name description: uplink-soap-desc +#ss220-uplink-discounts bgn productEntity: SoapSyndie - cost: + discountCategory: usualDiscounts + discountDownTo: Telecrystal: 1 +#ss220-uplink-discounts end + cost: + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1047,9 +1056,9 @@ productEntity: SlipocalypseClusterSoap discountCategory: rareDiscounts discountDownTo: - Telecrystal: 1 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 2 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1210,7 +1219,7 @@ description: uplink-cameraBug-desc productEntity: CameraBug cost: - Telecrystal: 4 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkDisruption @@ -1224,9 +1233,9 @@ productEntity: BoxHoloparasite discountCategory: usualDiscounts discountDownTo: - Telecrystal: 8 + Telecrystal: 11 #ss220-uplink-discounts cost: - Telecrystal: 14 + Telecrystal: 18 #ss220-uplink-discounts categories: - UplinkAllies conditions: @@ -1389,9 +1398,9 @@ productEntity: StorageImplanter discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts cost: - Telecrystal: 8 + Telecrystal: 6 #ss220-uplink-discounts categories: - UplinkImplants conditions: @@ -1409,9 +1418,9 @@ productEntity: FreedomImplanter discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 1 #ss220-uplink-minor-fixes-and-discounts + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 3 #SS220-underused-uplinks-stuff + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkImplants @@ -1437,9 +1446,9 @@ productEntity: DnaScramblerImplanter discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 5 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkImplants @@ -1455,7 +1464,7 @@ #Telecrystal: 1 #ss220 1 tc uplink sales fix end cost: - Telecrystal: 1 #SS220-underused-uplinks-stuff + Telecrystal: 5 #ss220-uplink-discounts categories: - UplinkImplants @@ -1560,7 +1569,7 @@ description: uplink-deathrattle-implant-desc productEntity: BoxDeathRattleImplants cost: - Telecrystal: 4 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkImplants conditions: @@ -1646,7 +1655,7 @@ discountDownTo: Telecrystal: 2 cost: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkWearables @@ -1657,9 +1666,9 @@ productEntity: ClothingShoesChameleonNoSlips discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 1 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 2 + Telecrystal: 4 #ss220-uplink-discounts categories: - UplinkWearables @@ -1670,9 +1679,9 @@ productEntity: ThievingGloves discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkWearables @@ -1683,9 +1692,9 @@ productEntity: ClothingOuterVestWeb discountCategory: usualDiscounts discountDownTo: - Telecrystal: 1 + Telecrystal: 3 #ss220-uplink-discounts cost: - Telecrystal: 3 + Telecrystal: 5 #ss220-uplink-discounts categories: - UplinkWearables @@ -1740,9 +1749,9 @@ productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 6 #ss220-uplink-discounts cost: - Telecrystal: 8 + Telecrystal: 12 #ss220-uplink-discounts categories: - UplinkWearables conditions: @@ -1765,17 +1774,20 @@ # icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } icon: { sprite: /Textures/SS220/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } #ss220 raid suit resprite productEntity: ClothingBackpackDuffelSyndicateRaidBundle +#ss220-uplink-discounts bgn + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 6 +#ss220-uplink-discounts end cost: Telecrystal: 8 categories: - UplinkWearables -#ss220 raid suit rework begin -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - NukeOpsUplink -#ss220 raid suit rework end + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkHardsuitSyndieElite @@ -2024,8 +2036,11 @@ name: uplink-scarf-syndie-red-name description: uplink-scarf-syndie-red-desc productEntity: ClothingNeckScarfStripedSyndieRed - cost: - Telecrystal: 1 + #SS220 free-scarf begin + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + #ss220 free-scarf end categories: - UplinkPointless @@ -2034,8 +2049,11 @@ name: uplink-scarf-syndie-green-name description: uplink-scarf-syndie-green-desc productEntity: ClothingNeckScarfStripedSyndieGreen - cost: - Telecrystal: 1 + #SS220 free-scarf begin + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + #ss220 free-scarf end categories: - UplinkPointless @@ -2212,9 +2230,9 @@ productEntity: BoxHoloclown discountCategory: rareDiscounts discountDownTo: - Telecrystal: 6 + Telecrystal: 8 #ss220-uplink-discounts cost: - Telecrystal: 12 + Telecrystal: 14 #ss220-uplink-discounts categories: - UplinkJob conditions: @@ -2251,9 +2269,9 @@ productEntity: WeaponPistolCHIMPUpgradeKit discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkJob conditions: diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index d841d5bf2ce7..2d1284dc10fe 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -185,14 +185,14 @@ coefficients: Blunt: 0.7 Slash: 0.8 - Heat: 1.5 + Heat: 1.25 #SS220 lowTTKUpdate Shock: 1.2 - type: damageModifierSet id: Moth # Slightly worse at everything but cold coefficients: Cold: 0.7 - Heat: 1.3 + Heat: 1.15 #SS220 lowTTKUpdate - type: damageModifierSet id: Vox @@ -205,7 +205,7 @@ Blunt: 0.6 Piercing: 0.8 Cold: 0.3 - Heat: 1.25 + Heat: 0.9 #SS220 lowTTKUpdate Poison: 0.0 Radiation: 0.0 Stamina: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 5089bd7b3d6d..8232ed2d0a68 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -489,6 +489,7 @@ - CombatKnife - Truncheon - HolofanProjectorSecurity # SS220 Fix #2009 + - KRSPowerCell # SS220-BlueShield MinorFix components: - Stunbaton - FlashOnTrigger diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index c8c83f9db80a..b5b2edadc2f8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -138,9 +138,9 @@ description: This robe commands authority. components: - type: Sprite - sprite: Clothing/OuterClothing/Misc/judge.rsi + sprite: SS220/Clothing/OuterClothing/Misc/judge.rsi #SS220 Law Department Sprite Update - type: Clothing - sprite: Clothing/OuterClothing/Misc/judge.rsi + sprite: SS220/Clothing/OuterClothing/Misc/judge.rsi #SS220 Law Department Sprite Update - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 0e38cd266d30..e69f98ed100d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -19,6 +19,9 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFreeAgent raffle: @@ -65,6 +68,9 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFamiliar raffle: @@ -163,6 +169,9 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist - type: Sprite @@ -180,6 +189,9 @@ name: ghost-role-information-space-ninja-name description: ghost-role-information-space-ninja-description rules: ghost-role-information-antagonist-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleSoloAntagonist raffle: @@ -200,6 +212,12 @@ name: ghost-role-information-derelict-cyborg-name description: ghost-role-information-derelict-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (10h overall) end raffle: settings: default - type: Sprite @@ -207,4 +225,4 @@ layers: - state: green - sprite: Mobs/Silicon/chassis.rsi - state: derelict_icon \ No newline at end of file + state: derelict_icon diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 73292f2f9072..afc9528bce1a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1403,6 +1403,9 @@ name: ghost-role-information-monkey-name description: ghost-role-information-monkey-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: # This is for syndicate monkeys that randomly gain sentience, thus have no summoner to team with - MindRoleGhostRoleSoloAntagonist @@ -2999,6 +3002,9 @@ allowMovement: true description: ghost-role-information-SyndiCat-description rules: ghost-role-information-SyndiCat-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 0cf75d67d942..822cc6ef97bc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -57,7 +57,7 @@ - type: MobThresholds thresholds: 0: Alive - 200: Dead + 250: Dead #SS220 Antag balance - type: MeleeWeapon altDisarm: false soundHit: @@ -103,6 +103,9 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFreeAgent raffle: @@ -220,8 +223,7 @@ shader: unshaded - type: Bloodstream bloodMaxVolume: 40 #SS220 RatBlood fix - - type: Insulated #SS220 RatKing Tweaks and changes - + - type: Insulated #SS220 RatKing Tweaks and changes - type: SpriteMovement movementLayers: movement: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 6e483253d205..4b448bc6f31c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -40,6 +40,9 @@ name: ghost-role-information-revenant-name description: ghost-role-information-revenant-description rules: ghost-role-information-antagonist-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleSoloAntagonist raffle: diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 1fbe336f9feb..aca185a148dd 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -15,6 +15,9 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: @@ -141,7 +144,7 @@ foodPreference: Humanoid shouldStoreDevoured: true chemical: Ichor - healRate: 15.0 + healRate: 25.0 #SS220 Antag balance whitelist: components: - MobState diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index 320a2b9bffe8..de532641e738 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -46,6 +46,9 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFamiliar raffle: diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index e553ed97f30f..c756e8fdf34c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -14,6 +14,9 @@ name: ghost-role-information-guardian-name description: ghost-role-information-guardian-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFamiliar raffle: @@ -126,6 +129,9 @@ name: ghost-role-information-holoparasite-name description: ghost-role-information-holoparasite-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -159,6 +165,9 @@ name: ghost-role-information-ifrit-name description: ghost-role-information-ifrit-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -188,6 +197,9 @@ name: ghost-role-information-holoclown-name description: ghost-role-information-holoclown-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 1f293f309602..8225b11f8297 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -87,9 +87,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -122,6 +126,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -146,6 +157,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -181,6 +199,10 @@ name: ghost-role-information-ert-chaplain-name description: ghost-role-information-ert-chaplain-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTChaplain @@ -213,6 +235,10 @@ name: ghost-role-information-ert-chaplain-name description: ghost-role-information-ert-chaplain-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTChaplain @@ -248,9 +274,10 @@ name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTJanitor @@ -283,6 +310,10 @@ name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTJanitor @@ -317,9 +348,14 @@ name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h eng) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Engineering + time: 36000 #SS220 ghostrole-times (20h sec 10h eng) end + raffle: settings: short job: ERTEngineer @@ -352,6 +388,13 @@ name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h eng) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Engineering + time: 36000 #SS220 ghostrole-times (20h sec 10h eng) end raffle: settings: short job: ERTEngineer @@ -386,9 +429,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -421,6 +465,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -445,6 +493,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -479,9 +531,13 @@ name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h med) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 #SS220 ghostrole-times (20h sec 10h med) end raffle: settings: short job: ERTMedical @@ -514,6 +570,13 @@ name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h med) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 #SS220 ghostrole-times (20h sec 10h med) end raffle: settings: short job: ERTMedical diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index a2b76cafbdd3..a619106a6292 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -613,6 +613,12 @@ name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable @@ -646,6 +652,12 @@ name: ghost-role-information-syndicate-cyborg-saboteur-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable @@ -696,6 +708,12 @@ name: ghost-role-information-derelict-cyborg-name description: ghost-role-information-derelict-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index f5b5f6ac197e..b93c43be674a 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -18,6 +18,9 @@ name: ghost-role-information-skeleton-pirate-name description: ghost-role-information-skeleton-pirate-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFreeAgent raffle: @@ -37,6 +40,9 @@ name: ghost-role-information-skeleton-biker-name description: ghost-role-information-skeleton-biker-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFreeAgent raffle: @@ -55,6 +61,9 @@ name: ghost-role-information-closet-skeleton-name description: ghost-role-information-closet-skeleton-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleFreeAgent raffle: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index fac37fc73ac1..efc0e512c2d6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -26,6 +26,9 @@ name: ghost-role-information-syndicate-reinforcement-spy-name description: ghost-role-information-syndicate-reinforcement-spy-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: @@ -66,6 +69,9 @@ name: ghost-role-information-nukeop-reinforcement-name description: ghost-role-information-nukeop-reinforcement-description rules: ghost-role-information-nukeop-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: @@ -83,6 +89,9 @@ name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: @@ -120,6 +129,9 @@ components: - type: GhostRole rules: ghost-role-information-nukeop-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end - type: GhostRoleMobSpawner prototype: MobMonkeySyndicateAgentNukeops selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"] @@ -134,6 +146,9 @@ name: ghost-role-information-SyndiCat-name description: ghost-role-information-SyndiCat-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end mindRoles: - MindRoleGhostRoleTeamAntagonist raffle: @@ -154,6 +169,12 @@ name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end mindRoles: - MindRoleGhostRoleSilicon raffle: diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 90aa01188d28..e5f1c7f6a838 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1104,12 +1104,12 @@ components: - type: AmmoCounter #SS220-FIX bullet show - type: Sprite - sprite: Objects/Fun/toys.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/toy.rsi # ss220 revolvers resprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - type: Item - sprite: Objects/Fun/toys.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/toy.rsi # ss220 revolvers resprite heldPrefix: capgun - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 00c10bb83c13..d14e7d6d95df 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -21,7 +21,7 @@ tags: - Sidearm - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi # ss220 revolvers resprite quickEquip: false slots: - suitStorage @@ -62,7 +62,7 @@ description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi # ss220 revolvers resprite layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -90,9 +90,9 @@ description: A detective's best friend. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi # ss220 revolvers resprite - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi # ss220 revolvers resprite - type: RevolverAmmoProvider proto: CartridgeMagnumRubber #ss-220 civDec capacity: 6 @@ -106,9 +106,9 @@ description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi # ss220 revolvers resprite - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi # ss220 revolvers resprite - type: Gun fireRate: 3 soundGunshot: @@ -129,9 +129,9 @@ description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/python.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/python.rsi # ss220 revolvers resprite - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/python.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/python.rsi # ss220 revolvers resprite - type: Gun selectedMode: SemiAuto fireRate: 2 @@ -162,9 +162,9 @@ description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi # ss220 revolvers resprite - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi + sprite: SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi # ss220 revolvers resprite - type: Gun fireRate: 1 - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 872f9fb253bd..b86f7d851161 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -232,7 +232,7 @@ - type: SpeakOnUIClosed pack: BruiseOMatGoodbyes - type: Sprite - sprite: Structures/Machines/VendingMachines/bruiseomat.rsi + sprite: SS220/Structures/Machines/VendingMachines/bruiseomat.rsi #SS220 BukhloMat Resprite layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 5de7600b19f4..00d88c241faf 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -107,7 +107,7 @@ - GroupTankHarness - LibrarianJumpsuit - CommonBackpack - - Glasses + - LibrarianEyes #SS220 ADD Monocle - Survival - Trinkets - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 98b45d44a25c..8d6fcaaf04c3 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -193,7 +193,7 @@ types: Bloodloss: -5 - !type:ModifyBleedAmount - amount: -1.5 + amount: -2 #SS220 Antag balance # Just in case you REALLY want to water your plants plantMetabolism: - !type:PlantAdjustWater diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index 1c760d4d1264..789b3a4b727d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -54,6 +54,7 @@ recipes: - PowerCellMicroreactor - PowerCellHigh + - BlasterPowerCellAlt #SS220 BlueShield MinorFix - type: latheRecipePack id: ScienceWeapons diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 971b7f2bcf2e..dc13f13c7805 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -43,6 +43,7 @@ - PowerCellHigh - TurboItemRechargerCircuitboard - SMESAdvancedMachineCircuitboard + - BlasterPowerCellAlt - type: technology id: MechanicalCompression diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml index d94866cafc8e..6eb7041550ae 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml @@ -148,7 +148,7 @@ - type: StorageFill contents: - id: BoxSurvivalSecurity - - id: WeaponBlasterKRS + - id: WeaponBlasterKRV - id: BlasterPowerCellPulse amount: 3 - id: BlasterPowerCellDisabler diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/SS220/Catalog/Fills/Items/briefcases.yml index a811f9e0c176..16e348e791f0 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Items/briefcases.yml @@ -8,3 +8,20 @@ - id: Paper amount: 3 - id: CentCommNewPen #SS220-BriefcaseMagistrate + +- type: entity + id: BriefcaseHiddenSlot + parent: BriefcaseBrown + components: + - type: ItemSlots + - type: ContainerContainer + containers: + storagebase: !type:Container + hidden_slot: !type:ContainerSlot { } + - type: ToggleableItemSlot + hiddenItemSlot: + name: construction-category-weapons + locked: true + whitelist: + components: + - Gun diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml index bf19ddc3bbdc..993a306dd6f6 100644 --- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml @@ -8,9 +8,9 @@ productEntity: WeaponMiniEnergyCrossbow discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 6 + Telecrystal: 8 #ss220-uplink-discounts cost: - Telecrystal: 10 + Telecrystal: 12 #ss220-uplink-discounts categories: - UplinkWeaponry conditions: @@ -153,9 +153,9 @@ productEntity: ThermalVisorChameleon discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: - Telecrystal: 4 + Telecrystal: 2 #ss220-uplink-discounts categories: - UplinkWearables @@ -167,9 +167,9 @@ productEntity: ThermalVisorImplanter discountCategory: rareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 6 + Telecrystal: 5 #ss220-uplink-discounts categories: - UplinkImplants @@ -209,9 +209,9 @@ productEntity: ClothingHeadHelmetSwatSyndicate discountCategory: rareDiscounts discountDownTo: - Telecrystal: 1 + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 2 + Telecrystal: 3 #ss220-uplink-discounts categories: - UplinkWearables @@ -222,7 +222,7 @@ productEntity: BorgModuleFlamingAxe discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts cost: Telecrystal: 3 categories: @@ -311,3 +311,17 @@ blacklist: components: - SurplusBundle + +- type: listing + id: UplinkBriefCaseDoubleBottom + name: uplink-clothing-briefcase-with-double-bottom-name + description: uplink-clothing-briefcase-with-double-bottom-desc + icon: { sprite: Objects/Storage/Briefcases/briefcase_brown.rsi, state: icon } + productEntity: BriefcaseHiddenSlot + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 2 + categories: + - UplinkWearables diff --git a/Resources/Prototypes/SS220/ChemicalImplants/uplink.yml b/Resources/Prototypes/SS220/ChemicalImplants/uplink.yml index 721f306784ff..94c8e959fe5c 100644 --- a/Resources/Prototypes/SS220/ChemicalImplants/uplink.yml +++ b/Resources/Prototypes/SS220/ChemicalImplants/uplink.yml @@ -6,8 +6,11 @@ description: uplink-chemical-implanter-desc icon: { sprite: SS220/Objects/ChemicalImplants/implanters.rsi, state: implanter } productEntity: ChemicalImplanter + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 2 #ss220-uplink-discounts cost: - Telecrystal: 6 + Telecrystal: 4 #ss220-uplink-discounts categories: - UplinkChemicalImplants @@ -46,7 +49,7 @@ icon: { sprite: SS220/Objects/ChemicalImplants/implants.rsi, state: dab } productEntity: DABChemicalImplant cost: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkChemicalImplants @@ -57,7 +60,7 @@ icon: { sprite: SS220/Objects/ChemicalImplants/implants.rsi, state: dead } productEntity: SuicideChemicalImplant cost: - Telecrystal: 2 + Telecrystal: 1 #ss220-uplink-discounts categories: - UplinkChemicalImplants conditions: diff --git a/Resources/Prototypes/SS220/Damage/modifier_sets.yml b/Resources/Prototypes/SS220/Damage/modifier_sets.yml index 57c99d894b22..8de953e48a6c 100644 --- a/Resources/Prototypes/SS220/Damage/modifier_sets.yml +++ b/Resources/Prototypes/SS220/Damage/modifier_sets.yml @@ -11,14 +11,14 @@ id: Tajaran coefficients: Cold: 0.8 - Heat: 1.3 # so about heat, we make them receive more heat cause tajaran Secs > any other species secs + Heat: 1.15 # so about heat, we make them receive more heat cause tajaran Secs > any other species secs #SS220 TTK update - type: damageModifierSet id: TomatoKiller coefficients: Blunt: 1 Slash: 1.3 - Piercing: 1.2 + Piercing: 0.8 Shock: 1.3 Cold: 1.5 Poison: 0.6 @@ -90,7 +90,8 @@ coefficients: Blunt: 1 Slash: 1.2 - Piercing: 0.6 + Piercing: 0.5 + Heat: 0.5 Shock: 1 Cold: 1 Poison: 1 @@ -102,7 +103,8 @@ coefficients: Blunt: 1 Slash: 1 - Piercing: 0.7 + Piercing: 0.6 + Heat: 0.6 Shock: 1.0 Cold: 1 Poison: 1 diff --git a/Resources/Prototypes/SS220/DemonRofler/rune.yml b/Resources/Prototypes/SS220/DemonRofler/rune.yml index 47733e71e177..74a8795b335d 100644 --- a/Resources/Prototypes/SS220/DemonRofler/rune.yml +++ b/Resources/Prototypes/SS220/DemonRofler/rune.yml @@ -14,6 +14,9 @@ name: Тёмный Жнец description: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" rules: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end makeSentient: false allowSpeech: false raffle: @@ -48,6 +51,9 @@ name: Тёмный Жнец description: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" rules: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end - type: Sprite sprite: Markers/jobs.rsi layers: diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml index 37c73b549fdd..87a932964df8 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml @@ -14,7 +14,7 @@ maxItemSize: Normal defaultStorageOrientation: Vertical grid: - - 0,0,4,2 + - 0,0,6,2 - type: entity parent: ClothingBeltBlueShield @@ -26,7 +26,7 @@ - id: Handcuffs - id: Handcuffs - id: GrenadeFlashBang - - id: GrenadeFlashBang + - id: RadioHandheldSecurity - id: FlashlightSeclite - type: entity @@ -52,6 +52,26 @@ - 8,2,8,3 - 9,1,9,1 - 10,1,10,2 + - type: ItemSlots + slots: + item: + name: clothing-boots-sidearm + whitelist: + tags: + - Sidearm + - Medkit + components: + - Stunbaton + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] + item: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: entity parent: ClothingBeltWebbingBlueShield @@ -65,6 +85,11 @@ - id: Handcuffs - id: GrenadeFlashBang - id: GrenadeFlashBang + - id: RadioHandheldSecurity + - type: ContainerFill + containers: + item: + - Stunbaton - type: entity parent: ClothingBeltSheath diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/base_clothingeyes.yml new file mode 100644 index 000000000000..47c10a699c9d --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -0,0 +1,41 @@ +- type: entity + parent: [ClothingEyesBase, BaseFoldable] + id: ClothingHeadEyeBaseFlippableAlt + abstract: true + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon_flipped + map: ["foldedLayer"] + visible: false + +- type: entity + parent: ClothingHeadEyeBaseFlippableAlt + id: ClothingHeadEyeBaseFlippedAlt + suffix: flipped + abstract: true + components: + - type: Foldable + folded: true + - type: Clothing + equippedPrefix: flipped + - type: Item + heldPrefix: flipped + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon_flipped + map: ["foldedLayer"] + visible: true diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/specific.yml new file mode 100644 index 000000000000..92ce84429ebc --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/specific.yml @@ -0,0 +1,22 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +- type: entity + parent: [ClothingEyesBase, ClothingHeadEyeBaseFlippableAlt] + id: ClothingEyesMonocle + name: monocle + description: An accessory that emphasizes sophistication and sophistication, a symbol of elegance and attention to detail. + components: + - type: Sprite + sprite: SS220/Clothing/Eyes/Specific/monocle.rsi + - type: Clothing + sprite: SS220/Clothing/Eyes/Specific/monocle.rsi + - type: VisionCorrection + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + +- type: entity + parent: [ClothingEyesMonocle, ClothingHeadEyeBaseFlippedAlt] + id: ClothingEyesMonocleFlipped + name: monocle diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml index ffa266774f3f..2962cd070ab7 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -145,3 +145,18 @@ - type: PressureProtection highPressureMultiplier: 0.32 lowPressureMultiplier: 1000 + +# Centcom's Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitCentcom + name: centcom hardsuit helmet + description: A combination of unwavering defense and advanced technology, the epitome of power and strategic superiority. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/centcom.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/centcom.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml index fd9ec18268a7..66c783a26006 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml @@ -91,6 +91,42 @@ sprite: SS220/Clothing/Head/Hats/beret_blueshield.rsi - type: Clothing sprite: SS220/Clothing/Head/Hats/beret_blueshield.rsi + +# Юридический департамент + + # Магистрат +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatStreetJudge + name: helmet street judge + description: Your head should inspire fear and pronounce judgments on the asphalt. + suffix: For playtime + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/streetjudge.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/streetjudge.rsi + #- type: Tag Расскоментировать, когда добавять версию шлема для гамлета + #tags: + #- HamsterWearable + + # АВД +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretIAA + name: beret iaa + description: Beret for the most deserving... but why is it blue? + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/beret_iaa.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/beret_iaa.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + # CentCom # Берет diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index c67ddffcaee8..f0a341225a9f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -272,3 +272,35 @@ Female: FemaleEngineer Unsexed: MaleEngineer +# Centcom's Hardsuit +- type: entity + parent: [ClothingOuterHardsuitBase] + id: ClothingOuterHardsuitCentcom + name: centcom spacesuit + description: A combination of unwavering defense and advanced technology, the epitome of power and strategic superiority. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor # Чуть лучше капитанского + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.5 + Heat: 0.4 + Radiation: 0.2 + Caustic: 0.4 + Stamina: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCentcom diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/paper.yml index e335c8cd637d..e7a82833470f 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/paper.yml @@ -394,3 +394,73 @@ - state: folder-base # Папки End + +- type: entity + parent: BaseItem + id: PaperAirplane + name: paper airplane + description: A toy airplane made of paper. + components: + - type: Paper + - type: PaperLabelType + - type: Item + size: Tiny + - type: Tag + tags: + - Document + - Paper + - type: Appearance + - type: FaxableObject + - type: Flammable + fireSpread: true + alwaysCombustible: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Food + solution: food + delay: 7 + forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Fiber + Quantity: 1 + - type: EmbeddableProjectile + offset: -0.15,0.0 + - type: ThrowingAngle + angle: -90 + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: paper_plane + - type: DamageOtherOnHit + damage: + types: + Piercing: 0.1 + - type: Construction + graph: PaperAirplane + node: paperairplane diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml index 3054bbf4ed9b..51610f24bc57 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml @@ -123,19 +123,13 @@ canReact: false reagents: - ReagentId: Rororium - Quantity: 3 + Quantity: 1.5 - ReagentId: Ephedrine - Quantity: 3 - - ReagentId: TranexamicAcid - Quantity: 15 - - ReagentId: Dylovene - Quantity: 15 - - ReagentId: Bicaridine - Quantity: 24 - - ReagentId: Pyrazine Quantity: 15 + - ReagentId: Ichor + Quantity: 30 - ReagentId: Epinephrine - Quantity: 15 + Quantity: 28.5 - type: TriggerImplantAction - type: HiddenDescription entries: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/powercells.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/powercells.yml index 46b2ecbb3f37..c7c12b9f0ddf 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/powercells.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/powercells.yml @@ -1,45 +1,106 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +#Base - type: entity - parent: BlasterPowerCell + abstract: true + parent: BaseItem + id: KRSPowerCell + components: + - type: Item + - type: Battery + pricePerJoule: 0.15 + maxCharge: 800 + startingCharge: 800 + - type: PowerCell + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Ammunition/Magazine/krs_magblaster.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: base + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: laser-mag-unshaded-1 + shader: unshaded + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - KRSPowerCell + - type: Appearance + - type: PowerCellVisuals + - type: Riggable + - type: AmmoCounter + - type: ProjectileBatteryAmmoProvider + proto: BulletBlaster + fireCost: 32 + +- type: entity + parent: KRSPowerCell id: BlasterPowerCellAlt name: blaster power cell description: It contains a lot more pain than you ever dreamed of. suffix: Laser components: - - type: Battery - pricePerJoule: 0.15 - maxCharge: 2000 - startingCharge: 2000 - type: ProjectileBatteryAmmoProvider proto: BulletBlasterAlt - fireCost: 100 + fireCost: 40 - type: entity - parent: BlasterPowerCell + id: BlasterPowerCellAltPrinted + suffix: Empty + parent: BlasterPowerCellAlt + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Ammunition/Magazine/krs_magblaster.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: base + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: laser-mag-unshaded-1 + shader: unshaded + visible: false + - type: Battery + maxCharge: 800 + startingCharge: 0 + +- type: entity + parent: KRSPowerCell id: BlasterPowerCellDisabler name: blaster power cell description: It contains a lot more pain than you ever dreamed of. suffix: Disabler components: - - type: Battery - pricePerJoule: 0.15 - maxCharge: 2000 - startingCharge: 2000 + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: base + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: disabler-mag-unshaded-1 + shader: unshaded - type: ProjectileBatteryAmmoProvider proto: BulletDisablerSmg - fireCost: 65 + fireCost: 24 - type: entity - parent: BlasterPowerCell + parent: KRSPowerCell id: BlasterPowerCellPulse name: blaster power cell description: It contains a lot more pain than you ever dreamed of. components: - type: Battery pricePerJoule: 0.15 - maxCharge: 3000 - startingCharge: 3000 + maxCharge: 1200 + startingCharge: 1200 - type: ProjectileBatteryAmmoProvider proto: BulletBlasterPulse - fireCost: 120 + fireCost: 48 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 19b6133cc245..d4f82ee2fe28 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -70,7 +70,7 @@ ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: tags: - - BlasterPowerCell + - KRSPowerCell - type: entity id: WeaponBlasterKRV @@ -90,7 +90,7 @@ ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: tags: - - BlasterPowerCell + - KRSPowerCell # Новые прототипы пишите выше # Death Squad diff --git a/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml b/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml index 4f2814e9b9d7..0a38662903bf 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml @@ -33,12 +33,13 @@ - type: CollisionWake enabled: false - type: SinguloFood - energy: 10000 + energy: 5000 - type: Explosive explosionType: Default - maxIntensity: 25000 - intensitySlope: 5 - totalIntensity: 25000 + maxIntensity: 60 + intensitySlope: 10 + totalIntensity: 100000 + maxTileBreak: 128 - type: NameIdentifier group: GenericNumber - type: TTS diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Crates/crates.yml index 7a8720197db6..2fe340d1e977 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/Crates/crates.yml @@ -66,3 +66,11 @@ node: cratewood containers: - entity_storage + +- type: entity + parent: CrateMedicalSecure + id: CrateMedicalSecureImplant + name: secure medical crate + components: + - type: AccessReader + access: [["Medical"], ["Command"], ["Security"]] diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/librarian.yml new file mode 100644 index 000000000000..2696f280a288 --- /dev/null +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/librarian.yml @@ -0,0 +1,20 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# Job Time +- type: loadoutEffectGroup + id: LibrarianMonocle + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLibrarian + time: 72000 # 20 + +# Eyes +- type: loadout + id: LibrarianMonocle + effects: + - !type:GroupLoadoutEffect + proto: LibrarianMonocle + equipment: + eyes: ClothingEyesMonocle diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/iaa.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/iaa.yml index df99122e0f59..ef7955f2d925 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/iaa.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/iaa.yml @@ -19,6 +19,11 @@ time: 180000 # 50 hrs # Head +- type: loadout + id: BeretIAA + equipment: + head: ClothingHeadHatBeretIAA + - type: loadout id: DevilHorns effects: diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/magistrate.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/magistrate.yml index 2314d2d24fbc..f52d694e3d52 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/magistrate.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/magistrate.yml @@ -1,9 +1,52 @@ -#Head +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# Job Time +- type: loadoutEffectGroup + id: MagistrateMonocle + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobMagistrate + time: 72000 # 20 hrs + +- type: loadoutEffectGroup + id: StreetJudge + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobMagistrate + time: 360000 # 100 hrs + +# Head - type: loadout id: MagistratePwig equipment: head: ClothingHeadHatPwig +- type: loadout + id: MagistrateStreetJudge + effects: + - !type:GroupLoadoutEffect + proto: StreetJudge + equipment: + head: ClothingHeadHatStreetJudge + +# Eyes +- type: loadout + id: GlassesCommand + equipment: + eyes: ClothingEyesGlassesCommand + +- type: loadout + id: MagistrateMonocle + effects: + - !type:GroupLoadoutEffect + proto: MagistrateMonocle + equipment: + eyes: ClothingEyesMonocle + # Outerclothing - type: loadout id: MagistrateRobesJudge diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index cd2328c4cd54..ea0b8a97629d 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -33,9 +33,16 @@ - type: loadoutGroup id: MagistrateHead name: loadout-group-magistrate-head - hidden: true loadouts: - MagistratePwig + - MagistrateStreetJudge + +- type: loadoutGroup + id: MagistrateEyes + name: loadout-group-magistrate-eyes + loadouts: + - GlassesCommand + - MagistrateMonocle - type: loadoutGroup id: MagistrateJumpsuit @@ -68,6 +75,7 @@ name: loadout-group-iaa-head minLimit: 0 loadouts: + - BeretIAA - DevilHorns - type: loadoutGroup @@ -753,6 +761,18 @@ # Сервисный работник (Конец) + # Библиотекарь (Начало) +- type: loadoutGroup + id: LibrarianEyes + name: loadout-group-librarian-eyes + loadouts: + - Glasses + - GlassesJamjar + - GlassesJensen + - LibrarianMonocle + - GlassesCyber + # Библиотекарь (Конец) + #! Сервис (Конец) #! Разное diff --git a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml index 378d6bf76b48..050f408dd584 100644 --- a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml @@ -7,6 +7,7 @@ id: JobMagistrate groups: - MagistrateHead + - MagistrateEyes - MagistrateHeadset - MagistrateJumpsuit - MagistrateOuterClothing diff --git a/Resources/Prototypes/SS220/Recipes/Construction/Graphs/misc/paper.yml b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/misc/paper.yml new file mode 100644 index 000000000000..dd5d35f4848d --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/misc/paper.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: PaperAirplane + start: start + graph: + - node: start + edges: + - to: paperairplane + steps: + - tag: Paper + name: a paper + doAfter: 1 + icon: + sprite: Objects/Misc/bureaucracy.rsi + state: paper + - node: paperairplane + entity: PaperAirplane diff --git a/Resources/Prototypes/SS220/Recipes/Construction/Misc/paper.yml b/Resources/Prototypes/SS220/Recipes/Construction/Misc/paper.yml new file mode 100644 index 000000000000..a10858be3635 --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Construction/Misc/paper.yml @@ -0,0 +1,10 @@ +- type: construction + name: paper airplane + id: PaperAirplane + graph: PaperAirplane + startNode: start + targetNode: paperairplane + category: construction-category-weapons + description: A toy airplane made of paper. + icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper_plane } + objectType: Item diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/powercells.yml b/Resources/Prototypes/SS220/Recipes/Lathes/powercells.yml new file mode 100644 index 000000000000..64a0b3a379b7 --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Lathes/powercells.yml @@ -0,0 +1,10 @@ +- type: latheRecipe + id: BlasterPowerCellAlt + result: BlasterPowerCellAltPrinted + category: Parts + completetime: 10 + materials: + Steel: 300 + Glass: 200 + Plastic: 300 + Gold: 50 diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Law/magistrate.yml b/Resources/Prototypes/SS220/Roles/Jobs/Law/magistrate.yml index bfb2b3b2dabb..cd8978ebac66 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/Law/magistrate.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/Law/magistrate.yml @@ -60,7 +60,6 @@ id: MagistrateGear equipment: shoes: ClothingShoesBootsLaceup - eyes: ClothingEyesGlassesCommand id: MagistratePDA inhand: - BriefcaseMagistrateFilled diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index 3b90c545a726..2ce1e380b89d 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -19,6 +19,9 @@ - type: Tag id: MagazineGrenadeArta +- type: Tag + id: KRSPowerCell + # READD-VEHICLES - type: Tag id: JanicartKeys diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorService.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorService.png index 36c967478479..81c394362a25 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorService.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorService.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png index 1be2cbc421b2..99909fa7b61d 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index cac6899c489d..7668e727744c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wielded states sprited by Estkemran (Github)", "size": { "x": 32, "y": 32 @@ -27,6 +27,14 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png new file mode 100644 index 000000000000..446936d43304 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png new file mode 100644 index 000000000000..0c244855b1a5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-hamster.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-hamster.png new file mode 100644 index 000000000000..5c26e9f9f976 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-monkey.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-monkey.png new file mode 100644 index 000000000000..f9a572e72404 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES.png new file mode 100644 index 000000000000..d05593aca7a0 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-hamster.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-hamster.png new file mode 100644 index 000000000000..79aab3e8c412 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-hamster.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-monkey.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-monkey.png new file mode 100644 index 000000000000..af6f7a61a2b2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES.png new file mode 100644 index 000000000000..5d270a5a32ee Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/flipped-equipped-EYES.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon.png new file mode 100644 index 000000000000..04cfcf5bc23e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon_flipped.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon_flipped.png new file mode 100644 index 000000000000..44bf23a8097b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/icon_flipped.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-left.png new file mode 100644 index 000000000000..59cd14237991 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-right.png new file mode 100644 index 000000000000..f00784375f68 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/meta.json b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/meta.json new file mode 100644 index 000000000000..c9fc3ea8f49a --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Eyes/Specific/monocle.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by dinazewwr (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-monkey", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "icon_flipped" + }, + { + "name": "flipped-equipped-EYES", + "directions": 4 + }, + { + "name": "flipped-equipped-EYES-monkey", + "directions": 4 + }, + { + "name": "flipped-equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png index a6edd35a4fb0..51ffade163a8 100644 Binary files a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon-flash.png new file mode 100644 index 000000000000..8422cc303b25 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon-flash.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon.png new file mode 100644 index 000000000000..e1ff708fcc2a Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/meta.json new file mode 100644 index 000000000000..5bd86349b4e6 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by abubben (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 000000000000..a874121728bb Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET.png new file mode 100644 index 000000000000..84ad9b4c0cd4 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 000000000000..98a5a7e622a6 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET.png new file mode 100644 index 000000000000..0606b87ac24c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/centcom.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET-hamster.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET-hamster.png new file mode 100644 index 000000000000..8faf7014da8c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..b916dbac52ff Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/icon.png new file mode 100644 index 000000000000..fb22a4327236 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-left.png new file mode 100644 index 000000000000..29b483c537ef Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-right.png new file mode 100644 index 000000000000..297988a06d55 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/meta.json new file mode 100644 index 000000000000..0c580f67da23 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hats/beret_iaa.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EstKemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..8aa99f160a6d Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/icon.png new file mode 100644 index 000000000000..1eca4a72233a Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-left.png new file mode 100644 index 000000000000..f32fb8f4e71d Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-right.png new file mode 100644 index 000000000000..0623a5a3632c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/meta.json new file mode 100644 index 000000000000..05cd40fb978b --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hats/streetjudge.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/ss220-space/Paradise/blob/HEAD/icons/mob/clothing/head.dmi, inhands states sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 000000000000..bb1395b2a20e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..2174e9efca02 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/icon.png new file mode 100644 index 000000000000..0825abb58abc Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-left.png new file mode 100644 index 000000000000..a8839e5cd676 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-right.png new file mode 100644 index 000000000000..c1f5ee72f8be Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/meta.json new file mode 100644 index 000000000000..3744a9d7ad59 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/centcom.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by abubben (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-rezomi.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-rezomi.png new file mode 100644 index 000000000000..801de683dc8d Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-rezomi.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 000000000000..f191e51e0dbb Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..6f52bfeab1d8 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/icon.png new file mode 100644 index 000000000000..5812256baedc Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-left.png new file mode 100644 index 000000000000..12d6ff219a9e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-right.png new file mode 100644 index 000000000000..8055eb340345 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/meta.json new file mode 100644 index 000000000000..78f15c26a8d4 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Misc/judge.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/HEAD/icons/mob/clothing/suits/costume.dmi, vox & rezomi & inhands states sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-rezomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png new file mode 100644 index 000000000000..9b0be6ff843f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png new file mode 100644 index 000000000000..27d72aa5077f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..27d72aa5077f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png new file mode 100644 index 000000000000..2f176ef1fe1b Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png new file mode 100644 index 000000000000..acbdf442c43e Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png new file mode 100644 index 000000000000..53d2a087156d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png new file mode 100644 index 000000000000..01bef87f5b95 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png new file mode 100644 index 000000000000..998975dc503e Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png new file mode 100644 index 000000000000..ec9754cd1322 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json new file mode 100644 index 000000000000..aa2907b583b2 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "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/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png new file mode 100644 index 000000000000..a1aced095d41 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-BELT.png new file mode 100644 index 000000000000..e07012d58fc0 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..e07012d58fc0 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png new file mode 100644 index 000000000000..cca4e596768d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png new file mode 100644 index 000000000000..2e5b6f578ea4 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png new file mode 100644 index 000000000000..41ad85a55691 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json new file mode 100644 index 000000000000..ee9e978458df --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "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/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png new file mode 100644 index 000000000000..2eb5a61717f1 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png new file mode 100644 index 000000000000..567d093cf61d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..567d093cf61d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png new file mode 100644 index 000000000000..5c3473a9fe59 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png new file mode 100644 index 000000000000..788ca1a08e93 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png new file mode 100644 index 000000000000..54897f487fdc Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json new file mode 100644 index 000000000000..ee9e978458df --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "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/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/bolt-open.png new file mode 100644 index 000000000000..7e01c4bb3018 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-BELT.png new file mode 100644 index 000000000000..9d181037bc7f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 000000000000..9d181037bc7f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png new file mode 100644 index 000000000000..6e93cf0ca289 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png new file mode 100644 index 000000000000..f88ea19dc49a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png new file mode 100644 index 000000000000..ce6f061db993 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json new file mode 100644 index 000000000000..f50450afc442 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png new file mode 100644 index 000000000000..aa8e274d58c8 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png new file mode 100644 index 000000000000..2fbb18d3162c Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png new file mode 100644 index 000000000000..c5339908af4f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png new file mode 100644 index 000000000000..800c7fd53c1a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png new file mode 100644 index 000000000000..004214676bc6 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json new file mode 100644 index 000000000000..b3177717ff17 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/base.png new file mode 100644 index 000000000000..180c54d3fcfe Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/base.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-left.png new file mode 100644 index 000000000000..5e439dada7f8 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-right.png new file mode 100644 index 000000000000..ee77053345d6 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/capgun-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/meta.json new file mode 100644 index 000000000000..433312b31339 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/toy.rsi/meta.json @@ -0,0 +1,23 @@ +{ +"version": 1, +"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", +"copyright": "By okroshka59 for SS220", +"size": { + "x": 32, + "y": 32 +}, +"states": [ + { + "name": "base" + }, + { + "name": "capgun-inhand-left", + "directions": 4 + }, + { + "name": "capgun-inhand-right", + "directions": 4 + } + +] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/bolt-open.png index fdc16ac51c01..9277a693e686 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/bolt-open.png and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/equipped-BELT.png index 8b8c80d75d4c..bd0e7ea29dd2 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/equipped-BELT.png and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/icon.png index 133e38a1d3cd..8419783d87cc 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/icon.png and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-left.png index 70f002561283..008fc80190b2 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-left.png and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-right.png index 7bb48eeadfd2..a334a512be65 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-right.png and b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/meta.json index 3088752152a8..b3177717ff17 100644 --- a/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Revolvers/unika.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-3.0", - "copyright": "Modified, original is made by CM-SS13 development team, taken at commit https://github.com/cmss13-devs/cmss13/commit/6126b50045cbf15649b0ebdcf1ceb546315e6b36", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "By okroshka59 for SS220", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png new file mode 100644 index 000000000000..6da6be558415 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png differ diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png new file mode 100644 index 000000000000..f6b53973f410 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json new file mode 100644 index 000000000000..7347809293ba --- /dev/null +++ b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BlueMoon at https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/blob/d5c5b13eb15294de804dbcfc418d8f2c1fac1af7/icons/obj/vending.dmi, modified by Estkemran (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png new file mode 100644 index 000000000000..d4fbf0343efd Binary files /dev/null and b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png new file mode 100644 index 000000000000..a9daa3bc1a0c Binary files /dev/null and b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png differ diff --git a/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png new file mode 100644 index 000000000000..9828e68474ab Binary files /dev/null and b/Resources/Textures/SS220/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png differ