diff --git a/Content.Client/Starshine/Eye/NightVision/NightVisionOverlay.cs b/Content.Client/Starshine/Eye/NightVision/NightVisionOverlay.cs index 7feb507c5e1c19..7442e95a7f667e 100644 --- a/Content.Client/Starshine/Eye/NightVision/NightVisionOverlay.cs +++ b/Content.Client/Starshine/Eye/NightVision/NightVisionOverlay.cs @@ -4,7 +4,7 @@ using Robust.Shared.Enums; using Robust.Shared.Prototypes; -namespace Content.Client.GG.Eye.NightVision +namespace Content.Client.Starshine.Eye.NightVision { public sealed class NightVisionOverlay : Overlay { @@ -17,16 +17,16 @@ public sealed class NightVisionOverlay : Overlay public override bool RequestScreenTexture => true; public override OverlaySpace Space => OverlaySpace.WorldSpace; private readonly ShaderInstance _greyscaleShader; - public Color NightvisionColor = Color.Green; + public Color Color; - private NightVisionComponent _nightvisionComponent = default!; + private NightVisionComponent _nightVisionComponent = default!; public NightVisionOverlay(Color color) { IoCManager.InjectDependencies(this); _greyscaleShader = _prototypeManager.Index("GreyscaleFullscreen").InstanceUnique(); - NightvisionColor = color; + Color = color; } protected override bool BeforeDraw(in OverlayDrawArgs args) { @@ -41,22 +41,20 @@ protected override bool BeforeDraw(in OverlayDrawArgs args) if (playerEntity == null) return false; - if (!_entityManager.TryGetComponent(playerEntity, out var nightvisionComp)) + if (!_entityManager.TryGetComponent(playerEntity, out var nightVisionComponent)) return false; - _nightvisionComponent = nightvisionComp; + _nightVisionComponent = nightVisionComponent; - var nightvision = _nightvisionComponent.IsNightVision; + var nightVision = _nightVisionComponent.IsOn; - if (!nightvision && _nightvisionComponent.DrawShadows) // Disable our Night Vision - { - _lightManager.DrawLighting = true; - _nightvisionComponent.DrawShadows = false; - _nightvisionComponent.GraceFrame = true; - return true; - } + if (nightVision || !_nightVisionComponent.DrawShadows) // Disable our Night Vision + return nightVision; + _lightManager.DrawLighting = true; + _nightVisionComponent.DrawShadows = false; + _nightVisionComponent.GraceFrame = true; + return true; - return nightvision; } protected override void Draw(in OverlayDrawArgs args) @@ -64,22 +62,22 @@ protected override void Draw(in OverlayDrawArgs args) if (ScreenTexture == null) return; - if (!_nightvisionComponent.GraceFrame) + if (!_nightVisionComponent.GraceFrame) { - _nightvisionComponent.DrawShadows = true; // Enable our Night Vision + _nightVisionComponent.DrawShadows = true; // Enable our Night Vision _lightManager.DrawLighting = false; } else { - _nightvisionComponent.GraceFrame = false; + _nightVisionComponent.GraceFrame = false; } - _greyscaleShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture); + _greyscaleShader.SetParameter("SCREEN_TEXTURE", ScreenTexture); var worldHandle = args.WorldHandle; var viewport = args.WorldBounds; worldHandle.UseShader(_greyscaleShader); - worldHandle.DrawRect(viewport, NightvisionColor); + worldHandle.DrawRect(viewport, Color); worldHandle.UseShader(null); } } diff --git a/Content.Client/Starshine/Eye/NightVision/NightVisionSystem.cs b/Content.Client/Starshine/Eye/NightVision/NightVisionSystem.cs index 490db00dacf0b8..00494fb0be5c42 100644 --- a/Content.Client/Starshine/Eye/NightVision/NightVisionSystem.cs +++ b/Content.Client/Starshine/Eye/NightVision/NightVisionSystem.cs @@ -1,12 +1,9 @@ using Content.Client.Overlays; -using Content.Shared.GameTicking; using Content.Shared.Starshine.Eye.NightVision.Components; using Content.Shared.Inventory.Events; using Robust.Client.Graphics; -using Robust.Client.Player; -using Robust.Shared.Player; -namespace Content.Client.GG.Eye.NightVision; +namespace Content.Client.Starshine.Eye.NightVision; public sealed class NightVisionSystem : EquipmentHudSystem { @@ -20,7 +17,7 @@ public override void Initialize() { base.Initialize(); - _overlay = new(Color.Green); + _overlay = new NightVisionOverlay(Color.Green); } protected override void UpdateInternal(RefreshEquipmentHudEvent component) @@ -29,7 +26,7 @@ protected override void UpdateInternal(RefreshEquipmentHudEvent()) { diff --git a/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs b/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs index 3e88efc1454fd6..91d00add517fea 100644 --- a/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs +++ b/Content.Shared/Starshine/Eye/NightVision/Components/NightVisionComponent.cs @@ -7,17 +7,17 @@ namespace Content.Shared.Starshine.Eye.NightVision.Components; [RegisterComponent] [NetworkedComponent, AutoGenerateComponentState] -[Access(typeof(NightVisionSystem))] +[Access(typeof(NightVisionSystem), typeof(PNVSystem))] public sealed partial class NightVisionComponent : Component { - [ViewVariables(VVAccess.ReadWrite), DataField("isOn"), AutoNetworkedField] - public bool IsNightVision; + [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] + public bool IsOn; - [DataField("color")] - public Color NightVisionColor = Color.Green; + [ViewVariables(VVAccess.ReadWrite), DataField] + public Color Color = Color.FromHex("#5cd65c"); [DataField] - public bool IsToggle = false; + public bool IsToggle; [DataField] public EntityUid? ActionContainer; @@ -27,9 +27,13 @@ public sealed partial class NightVisionComponent : Component [Access(Other = AccessPermissions.ReadWriteExecute)] public bool GraceFrame = false; - [DataField("playSoundOn")] + [DataField] public bool PlaySoundOn = true; - public SoundSpecifier OnOffSound = new SoundPathSpecifier("/Audio/Backmen/Misc/night-vision-sound-effect_E_minor.ogg"); + + [DataField] + public SoundSpecifier OffSound = new SoundPathSpecifier("/Audio/Starshine/Misc/night_vision.ogg"); } -public sealed partial class NVInstantActionEvent : InstantActionEvent { } +public sealed partial class NvInstantActionEvent : InstantActionEvent +{ +} diff --git a/Content.Shared/Starshine/Eye/NightVision/Components/PNVComponent.cs b/Content.Shared/Starshine/Eye/NightVision/Components/PNVComponent.cs index 08a1bca44dafa2..b72524eb407d5a 100644 --- a/Content.Shared/Starshine/Eye/NightVision/Components/PNVComponent.cs +++ b/Content.Shared/Starshine/Eye/NightVision/Components/PNVComponent.cs @@ -9,6 +9,9 @@ namespace Content.Shared.Starshine.Eye.NightVision.Components; [RegisterComponent, NetworkedComponent] public sealed partial class PNVComponent : Component { - [DataField] public EntProtoId ActionProto = "NVToggleAction"; - [DataField] public EntityUid? ActionContainer; + [DataField] + public EntProtoId ActionProto = "NVToggleAction"; + + [DataField] + public EntityUid? ActionContainer; } diff --git a/Content.Shared/Starshine/Eye/NightVision/Systems/NightVisionSystem.cs b/Content.Shared/Starshine/Eye/NightVision/Systems/NightVisionSystem.cs index 5786269320923d..218dd3f637ac2d 100644 --- a/Content.Shared/Starshine/Eye/NightVision/Systems/NightVisionSystem.cs +++ b/Content.Shared/Starshine/Eye/NightVision/Systems/NightVisionSystem.cs @@ -20,7 +20,7 @@ public override void Initialize() if(_net.IsServer) SubscribeLocalEvent(OnComponentStartup); - SubscribeLocalEvent(OnActionToggle); + SubscribeLocalEvent(OnActionToggle); } [ValidatePrototypeId] @@ -30,20 +30,19 @@ private void OnComponentStartup(EntityUid uid, NightVisionComponent component, C { if (component.IsToggle) _actionsSystem.AddAction(uid, ref component.ActionContainer, SwitchNightVisionAction); + _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(1)); // GCD? } - private void OnActionToggle(EntityUid uid, NightVisionComponent component, NVInstantActionEvent args) + private void OnActionToggle(EntityUid uid, NightVisionComponent component, NvInstantActionEvent args) { - component.IsNightVision = !component.IsNightVision; - var changeEv = new NightVisionnessChangedEvent(component.IsNightVision); + component.IsOn = !component.IsOn; + var changeEv = new NightVisionChangedEvent(component.IsOn); RaiseLocalEvent(uid, ref changeEv); Dirty(uid, component); - _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(1)); - if (component is { IsNightVision: true, PlaySoundOn: true }) - { - if(_net.IsServer) - _audioSystem.PlayPvs(component.OnOffSound, uid); - } + if (component is not { IsOn: true, PlaySoundOn: true }) + return; + if(_net.IsServer) + _audioSystem.PlayPvs(component.OffSound, uid); } [PublicAPI] @@ -52,24 +51,24 @@ public void UpdateIsNightVision(EntityUid uid, NightVisionComponent? component = if (!Resolve(uid, ref component, false)) return; - var old = component.IsNightVision; + var old = component.IsOn; var ev = new CanVisionAttemptEvent(); RaiseLocalEvent(uid, ev); - component.IsNightVision = ev.NightVision; + component.IsOn = ev.NightVision; - if (old == component.IsNightVision) + if (old == component.IsOn) return; - var changeEv = new NightVisionnessChangedEvent(component.IsNightVision); + var changeEv = new NightVisionChangedEvent(component.IsOn); RaiseLocalEvent(uid, ref changeEv); Dirty(uid, component); } } [ByRefEvent] -public record struct NightVisionnessChangedEvent(bool NightVision); +public record struct NightVisionChangedEvent(bool IsOn); public sealed class CanVisionAttemptEvent : CancellableEntityEventArgs, IInventoryRelayEvent diff --git a/Content.Shared/Starshine/Eye/NightVision/Systems/PNVSystem.cs b/Content.Shared/Starshine/Eye/NightVision/Systems/PNVSystem.cs index 7276a1900cb29d..5f39c0b1f5d455 100644 --- a/Content.Shared/Starshine/Eye/NightVision/Systems/PNVSystem.cs +++ b/Content.Shared/Starshine/Eye/NightVision/Systems/PNVSystem.cs @@ -36,18 +36,17 @@ private void OnEquipped(EntityUid uid, PNVComponent component, GotEquippedEvent if (HasComp(args.Equipee)) return; - var nvcomp = EnsureComp(args.Equipee); + var nvComp = EnsureComp(args.Equipee); - _nightvisionableSystem.UpdateIsNightVision(args.Equipee, nvcomp); + _nightvisionableSystem.UpdateIsNightVision(args.Equipee, nvComp); if(component.ActionContainer == null) _actionsSystem.AddAction(args.Equipee, ref component.ActionContainer, component.ActionProto); _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(1)); // GCD? - if (nvcomp.PlaySoundOn) - { - if(_net.IsServer) - _audioSystem.PlayPvs(nvcomp.OnOffSound, uid); - } + if (!nvComp.PlaySoundOn) + return; + if(_net.IsServer) + _audioSystem.PlayPvs(nvComp.OffSound, uid); } @@ -56,10 +55,10 @@ private void OnUnequipped(EntityUid uid, PNVComponent component, GotUnequippedEv if (args.Slot is not ("eyes" or "mask" or "head")) return; - if (!TryComp(args.Equipee, out var nvcomp)) + if (!TryComp(args.Equipee, out var nvComp)) return; - _nightvisionableSystem.UpdateIsNightVision(args.Equipee, nvcomp); + _nightvisionableSystem.UpdateIsNightVision(args.Equipee, nvComp); _actionsSystem.RemoveAction(args.Equipee, component.ActionContainer); component.ActionContainer = null; diff --git a/Resources/Audio/Starshine/Misc/night_vision.ogg b/Resources/Audio/Starshine/Misc/night_vision.ogg new file mode 100644 index 00000000000000..1a3d86d2a57e0b Binary files /dev/null and b/Resources/Audio/Starshine/Misc/night_vision.ogg differ diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index c564278537204e..b546f45b233f01 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -66,24 +66,3 @@ research-technology-advanced-spray = Продвинутый спрей research-technology-bluespace-cargo-transport = Блюспейс грузовой транспорт research-technology-bluespace-chemistry = Блюспейс Химия research-technology-quantum-fiber-weaving = Плетение квантовых волокон - -## Starshine - -research-technology-modsuitscraft = МОД-Костюмы -research-technology-comp-bows = Композитные луки -research-technology-standard-ammunition = Стандартные боеприпасы -research-technology-firearms = Огнестрельное оружие -research-technology-laser-weapons = Лазерное оружие -research-technology-armor-produce = Производство брони -research-technology-advanced-laser-weapons = Продвинутое лазерное оружие -research-technology-advanced-firearms = Продвинутое огнестрельное оружие -research-technology-advanced-ammunition = Продвинутые боеприпасы -research-technology-advanced-magazines = Продвинутые магазины -research-technology-incendiary-ammunition = Зажигательные боеприпасы -research-technology-spec-ammunition = Специализированные боеприпасы -research-technology-salvage-weapons-adv = Продвинутое оружие утилизаторов - -research-technology-clarke-aplu = КШГ Кларк -research-technology-Odyssey = ГМС Одиссей -research-technology-gygax = АБНТ Гайгэкс -research-technology-durand = БМП Дюранд diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl index 976795500674b0..464b37ac8f0609 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -18,6 +18,3 @@ ent-WeaponRevolverPythonAP = { ent-WeaponRevolverPython } ent-WeaponRevolverPirate = пиратский револьвер .desc = Странный, старый на вид револьвер, который использовали пираты. Использует патроны калибра .45 магнум. .suffix = Револьвер -ent-WeaponRevolverRsh18 = РШ18 - .desc = Редкий, изготавливаемый на заказ револьвер. Выдавался ограниченной партией офицерам синего щита. Использует патроны калибра 12.7 безгильзовые. - .suffix = Револьвер \ No newline at end of file diff --git a/Resources/Locale/ru-RU/starshine/research/technologies.ftl b/Resources/Locale/ru-RU/starshine/research/technologies.ftl new file mode 100644 index 00000000000000..f5521abd22c124 --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/research/technologies.ftl @@ -0,0 +1,23 @@ +## Starshine + +research-technology-modsuitscraft = МОД-Костюмы +research-technology-comp-bows = Композитные луки +research-technology-standard-ammunition = Стандартные боеприпасы +research-technology-firearms = Огнестрельное оружие +research-technology-laser-weapons = Лазерное оружие +research-technology-armor-produce = Производство брони +research-technology-advanced-laser-weapons = Продвинутое лазерное оружие +research-technology-advanced-firearms = Продвинутое огнестрельное оружие +research-technology-advanced-ammunition = Продвинутые боеприпасы +research-technology-advanced-magazines = Продвинутые магазины +research-technology-incendiary-ammunition = Зажигательные боеприпасы +research-technology-spec-ammunition = Специализированные боеприпасы +research-technology-salvage-weapons-adv = Продвинутое оружие утилизаторов +research-technology-large-caliber = Большой калибр + +research-technology-clarke-aplu = КШГ Кларк +research-technology-Odyssey = ГМС Одиссей +research-technology-gygax = АБНТ Гайгэкс +research-technology-durand = БМП Дюранд + +research-technology-nvd = Прибор ночного видения diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/eyes/nvd.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/eyes/nvd.ftl new file mode 100644 index 00000000000000..d56fd2d5d207ad --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/eyes/nvd.ftl @@ -0,0 +1,2 @@ +ent-ClothingEyesVision = ПНВ + .desc = Прибор ночного видения. Обеспечивает изображение местности в условиях низкой освещенности. diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/ammunition/speedloaders/antimaterial.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/ammunition/speedloaders/antimaterial.ftl new file mode 100644 index 00000000000000..435f356170fd5a --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/ammunition/speedloaders/antimaterial.ftl @@ -0,0 +1,2 @@ +ent-SpeedLoaderAntiMaterial = спидлоадер (.60 антиматериальные) + .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/revolvers/revolvers.ftl new file mode 100644 index 00000000000000..84c3b87b66cdf8 --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -0,0 +1,6 @@ +ent-WeaponRevolverRsh18 = РШ18 + .desc = Редкий, изготавливаемый на заказ револьвер. Выдавался ограниченной партией офицерам синего щита. Использует патроны калибра 12.7 безгильзовые. + .suffix = Револьвер +ent-WeaponRevolverSuppressor = Подавитель + .desc = Сверх тяжёлый револьвер для самых упитанных целей. + .suffix = Револьвер diff --git a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl new file mode 100644 index 00000000000000..e9b63869c53fbf --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl @@ -0,0 +1,25 @@ +## Starshine +uplink-bow-bundle-name = Набор композитного лука +uplink-bow-bundle-desc = Скрытая угроза: Композитный лук, созданный компанией Cybersun. Имеет с собой колчан стрел. +uplink-bow-compound-red-name = Кровавый композитный лук +uplink-bow-compound-red-desc = Залит кровью грейтайдов. Отличный легкий лук, в паре с пробивными стрелами. Можно модернизировать при помощи С4. +uplink-syndie-miner-armor-name = Кроваво-красная шахтерская броня +uplink-syndie-miner-armor-desc = Кроваво-красный вариант шахтерской брони. Мы надеемся, вы купили её, зная что делаете. +uplink-kr51-bundle-name = Набор КР51 +uplink-kr51-bundle-desc = Скрытая угроза: Классическая автоматическая винтовка КР51, в наборе с 3 магазинами. +uplink-magazine-caseless-rifle-name = Магазин винтовки (.25 безгильзовые) +uplink-magazine-caseless-rifle-desc = Магазин для винтовки с 30 безгильзовыми патронами. Совместим с КР51. +uplink-magazine-caseless-rifle-bundle-name = Набор с магазинами винтовки (.25) +uplink-magazine-caseless-rifle-bundle-desc = Набор, содержащий 4 расширенных магазина для дробовика. Совместим с КР51. +uplink-miniature-energy-crossbow-syndie-green-name = Энергетический мини арбалет +uplink-miniature-energy-crossbow-syndie-green-desc = Энергетический арбалет синдиката, маленький, бесшумный и смертоносный. +uplink-syringe-cartridge-name = Коробка шприцевых картриджей +uplink-syringe-cartridge-desc = Коробка шприцевых картриджей для шприцевого пистолета +uplink-gygax-syndie-name = АБМС «Гайгэкс» +uplink-gygax-desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. +uplink-mauler-name = АБМС «Маулер» +uplink-mauler-desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. +uplink-clothing-pnv-name = ПНВ +uplink-clothing-pnv-desc = Прибор ночного видения. +uplink-m90gl-bundle-name = Набор m90-gl +uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index b31a9ebf21ec03..04dc0b4fdd90ed 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -299,25 +299,3 @@ uplink-barber-scissors-name = Парикмахерские ножницы uplink-barber-scissors-desc = Хороший инструмент для того, чтобы подарить своему коллеге-агенту красивую стрижку, если, конечно, вы не хотите сделать её себе. uplink-backpack-syndicate-name = Рюкзак Синдиката uplink-backpack-syndicate-desc = Лёгкий взрывоустойчивый рюкзак для хранения различных предательских штучек. - -## Starshine -uplink-bow-bundle-name = Набор композитного лука -uplink-bow-bundle-desc = Скрытая угроза: Композитный лук, созданный компанией Cybersun. Имеет с собой колчан стрел. -uplink-bow-compound-red-name = Кровавый композитный лук -uplink-bow-compound-red-desc = Залит кровью грейтайдов. Отличный легкий лук, в паре с пробивными стрелами. Можно модернизировать при помощи С4. -uplink-syndie-miner-armor-name = Кроваво-красная шахтерская броня -uplink-syndie-miner-armor-desc = Кроваво-красный вариант шахтерской брони. Мы надеемся, вы купили её, зная что делаете. -uplink-kr51-bundle-name = Набор КР51 -uplink-kr51-bundle-desc = Скрытая угроза: Классическая автоматическая винтовка КР51, в наборе с 3 магазинами. -uplink-magazine-caseless-rifle-name = Магазин винтовки (.25 безгильзовые) -uplink-magazine-caseless-rifle-desc = Магазин для винтовки с 30 безгильзовыми патронами. Совместим с КР51. -uplink-magazine-caseless-rifle-bundle-name = Набор с магазинами винтовки (.25) -uplink-magazine-caseless-rifle-bundle-desc = Набор, содержащий 4 расширенных магазина для дробовика. Совместим с КР51. -uplink-miniature-energy-crossbow-syndie-green-name = Энергетический мини арбалет -uplink-miniature-energy-crossbow-syndie-green-desc = Энергетический арбалет синдиката, маленький, бесшумный и смертоносный. -uplink-syringe-cartridge-name = Коробка шприцевых картриджей -uplink-syringe-cartridge-desc = Коробка шприцевых картриджей для шприцевого пистолета -uplink-gygax-syndie-name = АБМС «Гайгэкс» -uplink-gygax-desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. -uplink-mauler-name = АБМС «Маулер» -uplink-mauler-desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 8af06a42e3af11..f27a8e3620bb9b 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -173,19 +173,13 @@ parent: WeaponcaseSyndie id: ClothingBackpackDuffelSyndicateFilledCarbine name: M-90gl bundle - description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities." + description: "A versatile battle rifle with an attached grenade launcher (The grenade launcher is not real, it is a dummy)." components: - type: StorageFill contents: - id: WeaponRifleM90GrenadeLauncher - id: MagazineRifle amount: 2 - - id: GrenadeBlast - amount: 2 - - id: GrenadeFlash - amount: 2 - - id: GrenadeFrag - amount: 2 - type: entity parent: ClothingBackpackDuffelSyndicateAmmo @@ -201,6 +195,8 @@ amount: 4 - id: MagazineLightRifleBox amount: 2 + - id: MagazineRifle + amount: 4 - type: entity parent: ClothingBackpackDuffelSyndicateAmmo diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 214d45f5b2d4d8..8c05cd0ef45a1f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -11,7 +11,10 @@ - id: ClothingBeltUtilityFilled - id: SurvivalKnife - id: HandheldGPSBasic + - id: ClothingBeltMinerWebbing + - id: ClothingBeltSalvageWebbing - id: RadioHandheld + - id: ClothingOuterArmorMiner - id: SeismicCharge amount: 2 - id: OreBag @@ -35,7 +38,10 @@ - id: ClothingBeltUtilityFilled - id: SurvivalKnife - id: HandheldGPSBasic + - id: ClothingBeltMinerWebbing + - id: ClothingBeltSalvageWebbing - id: RadioHandheld + - id: ClothingOuterArmorMiner - id: SeismicCharge amount: 2 - id: OreBag diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ccdd9ce09df806..5cb2e4bccddceb 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1382,16 +1382,6 @@ categories: - UplinkWearables -- type: listing - id: UplinkClothingOuterVestWeb - name: uplink-clothing-outer-vest-web-name - description: uplink-clothing-outer-vest-web-desc - productEntity: ClothingOuterVestWeb - cost: - Telecrystal: 3 - categories: - - UplinkWearables - - type: listing id: UplinkClothingShoesBootsMagSyndie name: uplink-clothing-shoes-boots-mag-syndie-name @@ -1864,137 +1854,3 @@ blacklist: components: - SurplusBundle - -## Starshine - -- type: listing - id: UplinkMiniatureEnergyCrossbow - name: uplink-miniature-energy-crossbow-syndie-green-name - description: uplink-miniature-energy-crossbow-syndie-green-desc - icon: { sprite: Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon } - productEntity: MiniatureEnergyCrossbow - cost: - Telecrystal: 10 - categories: - - UplinkWeaponry - -- type: listing - id: UplinkBowCompoundRed - name: uplink-bow-compound-red-name - description: uplink-bow-compound-red-desc - productEntity: BowCompoundRed - cost: - Telecrystal: 8 - categories: - - UplinkWeaponry - -- type: listing - id: UplinkKR51Bundle - name: uplink-kr51-bundle-name - description: uplink-kr51-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/kr51.rsi, state: icon } - productEntity: ClothingBackpackDuffelSyndicateFilledRifle - cost: - Telecrystal: 25 - categories: - - UplinkWeaponry - -- type: listing - id: UplinkMagazineCaselessRifle - name: uplink-magazine-caseless-rifle-name - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: red } - description: uplink-magazine-caseless-rifle-desc - productEntity: MagazineCaselessRifle - cost: - Telecrystal: 3 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - -- type: listing - id: UplinkSyringeCartridge - name: uplink-syringe-cartridge-name - description: uplink-syringe-cartridge-desc - productEntity: BoxSyringeCartridge - cost: - Telecrystal: 6 - categories: - - UplinkAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - -- type: listing - id: uplinkMinerSyndie - name: uplink-syndie-miner-armor-name - description: uplink-syndie-miner-armor-desc - productEntity: ClothingOuterArmorMinerSyndie - cost: - Telecrystal: 6 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - Miner - -#- type: listing -# id: UplinkSyndicateMauler -# name: uplink-mauler-name -# description: uplink-mauler-desc -# icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler } -# productEntity: MechMaulerReal -# cost: -# Telecrystal: 120 -# categories: -# - UplinkWeaponry -# conditions: -# - !type:BuyerWhitelistCondition -# blacklist: -# components: -# - SurplusBundle - -#- type: listing -# id: UplinkSyndicateGygax -# name: uplink-gygax-syndie-name -# description: uplink-gygax-desc -# icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax } -# productEntity: MechDarkGygax -# cost: -# Telecrystal: 70 -# categories: -# - UplinkWeaponry -# conditions: -# - !type:BuyerWhitelistCondition -# blacklist: -# components: -# - SurplusBundle - -#- type: listing -# id: UplinkSyringeCartridge -# name: uplink-syringe-cartridge-name -# description: uplink-syringe-cartridge-desc -# productEntity: BoxSyringeCartridge -# cost: -# Telecrystal: 6 -# categories: -# - UplinkAmmo -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - NukeOpsUplink -# - !type:BuyerWhitelistCondition -# blacklist: -# components: -# - SurplusBundle diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 16dee73a71548c..1319fe9c1aaf74 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -219,6 +219,7 @@ Heat: 0.9 Radiation: 0.85 Caustic: 0.85 + Stun: 0.9 - type: PressureProtection highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 893b79f9665a6b..116767d04df6c8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -59,6 +59,7 @@ Heat: 0.80 Radiation: 0.80 Caustic: 0.95 + Stun: 0.95 - type: ExplosionResistance damageCoefficient: 0.75 @@ -93,6 +94,7 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.95 + Stun: 0.95 #Bombsuit Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 1c139194fd19ca..d4859067707a4a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -19,6 +19,7 @@ Slash: 0.70 Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. Heat: 0.80 + Stun: 0.9 - type: ExplosionResistance damageCoefficient: 0.90 @@ -52,6 +53,7 @@ Slash: 0.70 Piercing: 0.60 Heat: 0.80 + Stun: 0.85 - type: ExplosionResistance damageCoefficient: 0.80 @@ -73,6 +75,7 @@ Piercing: 0.7 Heat: 0.9 Caustic: 0.9 + Stun: 0.5 - type: ExplosionResistance damageCoefficient: 0.9 - type: GroupExamine @@ -405,6 +408,7 @@ Piercing: 0.5 Heat: 0.9 Radiation: 0.8 + Stun: 0.5 - type: ClothingSpeedModifier walkModifier: 0.7 sprintModifier: 0.65 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index dcb4285e95c20c..f675a3a32a03c4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -218,6 +218,7 @@ Piercing: 0.6 Heat: 0.75 Caustic: 0.7 + Stun: 0.8 - type: ClothingSpeedModifier walkModifier: 0.75 sprintModifier: 0.75 @@ -307,6 +308,7 @@ Piercing: 0.6 Heat: 0.7 Caustic: 0.7 + Stun: 0.8 - type: ClothingSpeedModifier walkModifier: 0.7 sprintModifier: 0.7 @@ -520,6 +522,7 @@ Heat: 0.6 Radiation: 0.5 Caustic: 0.6 + Stun: 0.7 - type: ClothingSpeedModifier walkModifier: 0.8 sprintModifier: 0.8 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 1739d8e4b09fcf..8c189849bb077c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2279,6 +2279,10 @@ groups: Brute: -0.07 Burn: -0.07 + - type: NightVision + isToggle: true + color: "#ff6161" + playSoundOn: false - type: entity name: tarantula @@ -2348,6 +2352,10 @@ - type: Bloodstream bloodMaxVolume: 150 bloodReagent: Laughter + - type: NightVision + isToggle: true + color: "#6666ff" + playSoundOn: false - type: entity name: wizard spider diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index c615b8721e010c..e51df9d0023483 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -120,6 +120,10 @@ - type: Grammar attributes: gender: male + - type: NightVision + isToggle: true + color: "#ff6161" + playSoundOn: false - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 31d7b65fe8b1e1..e562cd7e74ec1a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 40 + Piercing: 60 Structural: 30 - type: StaminaDamageOnCollide damage: 35 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 5bf086b0ea284b..1a82002ab5d875 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -217,15 +217,17 @@ - type: StaticPrice price: 420 - type: Gun + fireRate: 2.5 selectedMode: SemiAuto availableModes: - SemiAuto + - FullAuto - type: Tag tags: - HeavyWeapon - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 62.5 + fireCost: 50 - type: entity name: practice laser rifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 674f6b15186d22..e16ad26107b22d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -164,23 +164,3 @@ chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] -- type: entity - name: RSH18 - parent: BaseWeaponRevolver - id: WeaponRevolverRsh18 - description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/rsh18.rsi - - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/rsh18.rsi - - type: RevolverAmmoProvider - whitelist: - tags: - - CartridgeUniversal - - SpeedLoaderUniversal - proto: CartridgeCaselessUniversalPT1 - - type: Gun - fireRate: 3 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/rsh18.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 1ca50aacf5eec1..bf869186fea128 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -23,6 +23,7 @@ selectedMode: FullAuto availableModes: - FullAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - type: ChamberMagazineAmmoProvider @@ -160,6 +161,10 @@ - type: Clothing sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun + selectedMode: FullAuto + availableModes: + - FullAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index dcd6867f04e2aa..4e36bca40d3f66 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -75,6 +75,7 @@ selectedMode: FullAuto availableModes: - FullAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg soundEmpty: @@ -103,38 +104,6 @@ - type: StaticPrice price: 500 -- type: entity - name: saiga - parent: WeaponShotgunBulldog - id: WeaponShotgunSaiga - description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/saiga.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/saiga.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineShotgunSaiga - priority: 2 - whitelist: - tags: - - MagazineShotgun - - MagazineShotgunSaiga - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - - type: entity name: double-barreled shotgun parent: [BaseWeaponShotgun, BaseGunWieldable] @@ -320,7 +289,7 @@ - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. - type: BallisticAmmoProvider - capacity: 1 + capacity: 2 proto: null - type: Construction graph: ImprovisedShotgunGraph diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 746ddb5dcc34d5..e8e5000d429e5b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -67,7 +67,7 @@ whitelist: tags: - CartridgeAntiMateriel - capacity: 5 + capacity: 7 proto: CartridgeAntiMateriel - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6ffcafcc8a7999..cc2e58c11af5dc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -326,6 +326,7 @@ # Starshine-start - WeaponCutterAdv - WeaponTetherGun + - ClothingEyesVision # Starshine-end - WeaponGrapplingGun - ClothingBackpackHolding @@ -808,6 +809,8 @@ - SpeedLoaderMagnumPractice # Starshine-end dynamicRecipes: + - WeaponDisablerSMG + - WeaponDisabler - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium @@ -857,12 +860,6 @@ - TimerTrigger - Truncheon - VoiceTrigger - - WeaponAdvancedLaser - - WeaponDisabler - - WeaponDisablerSMG - - WeaponLaserCannon - - WeaponLaserCarbine - - WeaponXrayCannon # Starshine-start - BowCompound - ArrowCompound @@ -876,6 +873,9 @@ - ClothingOuterArmorBulletproof - ClothingBeltSecurityWebbing - ClothingBeltSecurity +# Starshine-end +# Starshine-start + - SpeedLoaderAntiMaterial # Starshine-end - type: MaterialStorage whitelist: @@ -933,6 +933,7 @@ - WeaponXrayCannon - WeaponShotgunKammerer - WeaponShotgunEnforcer + - WeaponRevolverSuppressor - type: MaterialStorage whitelist: tags: @@ -1015,7 +1016,9 @@ - MagazineBoxRifleRubber - BoxLethalshot - BoxShotgunIncendiary - - BoxBeanbag + - BoxBeanbag + - SpeedLoaderAntiMaterial + - MagazineBoxAntiMaterielBig - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Starshine/Actions/PNV.yml b/Resources/Prototypes/Starshine/Actions/PNV.yml index 1842ea8bf536e7..a9c1ac8e47bcfa 100644 --- a/Resources/Prototypes/Starshine/Actions/PNV.yml +++ b/Resources/Prototypes/Starshine/Actions/PNV.yml @@ -9,4 +9,16 @@ icon: sprite: Clothing/Eyes/Glasses/ninjavisor.rsi state: icon - event: !type:NVInstantActionEvent + event: !type:NvInstantActionEvent + +- type: entity + id: NVToggleAction + name: toggle nvd + description: Toggles your NVD + components: + - type: InstantAction + useDelay: 2.5 + icon: + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + state: icon + event: !type:NvInstantActionEvent diff --git a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000000..04876086f1e52b --- /dev/null +++ b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml @@ -0,0 +1,167 @@ +## Starshine + +- type: listing + id: UplinkMiniatureEnergyCrossbow + name: uplink-miniature-energy-crossbow-syndie-green-name + description: uplink-miniature-energy-crossbow-syndie-green-desc + icon: { sprite: Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon } + productEntity: MiniatureEnergyCrossbow + cost: + Telecrystal: 10 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkBowCompoundRed + name: uplink-bow-compound-red-name + description: uplink-bow-compound-red-desc + productEntity: BowCompoundRed + cost: + Telecrystal: 8 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkKR51Bundle + name: uplink-kr51-bundle-name + description: uplink-kr51-bundle-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/kr51.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledRifle + cost: + Telecrystal: 17 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkMagazineCaselessRifle + name: uplink-magazine-caseless-rifle-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: red } + description: uplink-magazine-caseless-rifle-desc + productEntity: MagazineCaselessRifle + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkSyringeCartridge + name: uplink-syringe-cartridge-name + description: uplink-syringe-cartridge-desc + productEntity: BoxSyringeCartridge + cost: + Telecrystal: 6 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + +- type: listing + id: uplinkMinerSyndie + name: uplink-syndie-miner-armor-name + description: uplink-syndie-miner-armor-desc + productEntity: ClothingOuterArmorMinerSyndie + cost: + Telecrystal: 3 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - SalvageSpecialist + +- type: listing + id: UplinkM90GLBundle + name: uplink-m90gl-bundle-name + description: uplink-m90gl-bundle-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledCarbine + cost: + Telecrystal: 17 + categories: + - UplinkWeaponry + + +- type: listing + id: UplinkClothingOuterVestWeb + name: uplink-clothing-outer-vest-web-name + description: uplink-clothing-outer-vest-web-desc + productEntity: ClothingOuterVestWeb + cost: + Telecrystal: 5 + categories: + - UplinkWearables + +- type: listing + id: UplinkClothingEyesVision + name: uplink-clothing-pnv-name + description: uplink-clothing-pnv-desc + productEntity: ClothingEyesVision + cost: + Telecrystal: 3 + categories: + - UplinkWearables + + + +#- type: listing +# id: UplinkSyndicateMauler +# name: uplink-mauler-name +# description: uplink-mauler-desc +# icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler } +# productEntity: MechMaulerReal +# cost: +# Telecrystal: 120 +# categories: +# - UplinkWeaponry +# conditions: +# - !type:BuyerWhitelistCondition +# blacklist: +# components: +# - SurplusBundle + +#- type: listing +# id: UplinkSyndicateGygax +# name: uplink-gygax-syndie-name +# description: uplink-gygax-desc +# icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax } +# productEntity: MechDarkGygax +# cost: +# Telecrystal: 70 +# categories: +# - UplinkWeaponry +# conditions: +# - !type:BuyerWhitelistCondition +# blacklist: +# components: +# - SurplusBundle + +#- type: listing +# id: UplinkSyringeCartridge +# name: uplink-syringe-cartridge-name +# description: uplink-syringe-cartridge-desc +# productEntity: BoxSyringeCartridge +# cost: +# Telecrystal: 6 +# categories: +# - UplinkAmmo +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - NukeOpsUplink +# - !type:BuyerWhitelistCondition +# blacklist: +# components: +# - SurplusBundle diff --git a/Resources/Prototypes/Starshine/Entities/Clothing/Eyes/PNV.yml b/Resources/Prototypes/Starshine/Entities/Clothing/Eyes/PNV.yml new file mode 100644 index 00000000000000..69e25adcedd0f3 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Clothing/Eyes/PNV.yml @@ -0,0 +1,15 @@ +- type: entity + name: NVD + id: ClothingEyesVision + parent: BaseItem + description: Night vision device. Provides an image of the terrain in low-light conditions. + components: + - type: Item + - type: Sprite + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + state: icon + - type: Clothing + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + quickEquip: true + slots: [ Eyes ] + - type: PNV diff --git a/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/hardsuits.yml index 19a8f0bc6ec5f3..73e1b91367a227 100644 --- a/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Starshine/Entities/Clothing/OuterClothing/hardsuits.yml @@ -104,6 +104,7 @@ Heat: 0.1 Radiation: 0 Caustic: 0.2 + Stun: 0.9 - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 @@ -135,6 +136,7 @@ Heat: 0.50 Radiation: 0.25 Caustic: 0.50 + Stun: 0.8 - type: ClothingSpeedModifier walkModifier: 0.85 sprintModifier: 0.85 diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/antimateriel.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/antimateriel.yml new file mode 100644 index 00000000000000..abd5e542c48d9e --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/antimateriel.yml @@ -0,0 +1,27 @@ +- type: entity + id: SpeedLoaderAntiMaterial + name: "speed loader (.60 antimaterial)" + parent: BaseSpeedLoaderMagnum + components: + - type: Tag + tags: + - SpeedLoaderAntiMaterial + - type: BallisticAmmoProvider + proto: CartridgeAntiMateriel + whitelist: + tags: + - CartridgeAntiMateriel + capacity: 3 + - type: Sprite + sprite: Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-3 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 4 + zeroVisible: false + - type: Appearance + diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 00000000000000..9174cedd5a0285 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1,46 @@ +- type: entity + name: Suppressor + parent: BaseWeaponRevolver + id: WeaponRevolverSuppressor + description: A super-heavy revolver for the most well-fed purposes. + components: + - type: Sprite + sprite: Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi + - type: Clothing + sprite: Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeAntiMateriel + - SpeedLoaderAntiMaterial + capacity: 3 + proto: CartridgeAntiMateriel + chambers: [ True, True, True ] + ammoSlots: [ null, null, null ] + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: StaticPrice + price: 1000 + +- type: entity + name: RSH18 + parent: BaseWeaponRevolver + id: WeaponRevolverRsh18 + description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi + - type: Clothing + sprite: Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeUniversal + - SpeedLoaderUniversal + proto: CartridgeCaselessUniversalPT1 + - type: Gun + fireRate: 3 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rsh18.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index ec5a4bb7b28d71..5215389fb11e00 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -37,6 +37,10 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun + selectedMode: FullAuto + availableModes: + - FullAuto + - SemiAuto fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml new file mode 100644 index 00000000000000..6b8bd72c7f7a95 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -0,0 +1,31 @@ +- type: entity + name: saiga + parent: WeaponShotgunBulldog + id: WeaponShotgunSaiga + description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/saiga.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/saiga.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineShotgunSaiga + priority: 2 + whitelist: + tags: + - MagazineShotgun + - MagazineShotgunSaiga + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg diff --git a/Resources/Prototypes/Starshine/Recipes/Lathes/misc.yml b/Resources/Prototypes/Starshine/Recipes/Lathes/misc.yml new file mode 100644 index 00000000000000..eeab4797d7d8fa --- /dev/null +++ b/Resources/Prototypes/Starshine/Recipes/Lathes/misc.yml @@ -0,0 +1,9 @@ +- type: latheRecipe + id: ClothingEyesVision + result: ClothingEyesVision + completetime: 2 + materials: + Steel: 100 + Glass: 100 + Plastic: 100 + Gold: 50 diff --git a/Resources/Prototypes/Starshine/Recipes/Lathes/security.yml b/Resources/Prototypes/Starshine/Recipes/Lathes/security.yml new file mode 100644 index 00000000000000..60b495a100eb5e --- /dev/null +++ b/Resources/Prototypes/Starshine/Recipes/Lathes/security.yml @@ -0,0 +1,23 @@ +- type: latheRecipe + id: WeaponRevolverSuppressor + result: WeaponRevolverSuppressor + completetime: 15 + materials: + Steel: 1500 + Silver: 300 + +- type: latheRecipe + id: MagazineBoxAntiMaterielBig + result: MagazineBoxAntiMaterielBig + category: Ammo + completetime: 10 + materials: + Steel: 1500 + +- type: latheRecipe + id: SpeedLoaderAntiMaterial + result: SpeedLoaderAntiMaterial + category: Ammo + completetime: 10 + materials: + Steel: 300 \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Research/arsenal.yml b/Resources/Prototypes/Starshine/Research/arsenal.yml index c20257cfc9a70c..06b7cb40cea136 100644 --- a/Resources/Prototypes/Starshine/Research/arsenal.yml +++ b/Resources/Prototypes/Starshine/Research/arsenal.yml @@ -180,3 +180,17 @@ - GygaxRLeg - GygaxRArm - GygaxArmor + +- type: technology + id: LargeCaliber + name: research-technology-large-caliber + icon: + sprite: Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi + state: icon + discipline: Arsenal + tier: 3 + cost: 20000 + recipeUnlocks: + - WeaponRevolverSuppressor + - SpeedLoaderAntiMaterial + - MagazineBoxAntiMaterielBig diff --git a/Resources/Prototypes/Starshine/Research/experimental.yml b/Resources/Prototypes/Starshine/Research/experimental.yml new file mode 100644 index 00000000000000..cec0632ac140c0 --- /dev/null +++ b/Resources/Prototypes/Starshine/Research/experimental.yml @@ -0,0 +1,13 @@ +# Tier 2 + +- type: technology + id: PNV + name: research-technology-nvd + icon: + sprite: Clothing/Eyes/Glasses/ninjavisor.rsi + state: icon + discipline: Experimental + tier: 2 + cost: 10000 + recipeUnlocks: + - ClothingEyesVision diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 3080d196ecc8d1..e54a2171f5213a 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1534,3 +1534,6 @@ - type: Tag id: Slime + +- type: Tag + id: SpeedLoaderAntiMaterial diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-BACKPACK.png index fec8e0750392d2..d1330a02484a12 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000000..d1330a02484a12 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/meta.json index e3f02f004516c8..c02a0042d00e60 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/meta.json @@ -7,29 +7,41 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000000..628d55474ba5f4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000000..5c3319f9300736 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/kr51.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-1.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-1.png new file mode 100644 index 00000000000000..aaab26438376de Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-1.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-2.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-2.png new file mode 100644 index 00000000000000..df5786c2994097 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-2.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-3.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-3.png new file mode 100644 index 00000000000000..8fd91b4a42e300 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base-3.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base.png new file mode 100644 index 00000000000000..ea98476d7ab9c1 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/icon.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/icon.png new file mode 100644 index 00000000000000..fac9d844ad509e Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/meta.json b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/meta.json new file mode 100644 index 00000000000000..5355e5947f5998 --- /dev/null +++ b/Resources/Textures/Starshine/Objects/Weapons/Guns/Ammunition/SpeedLoaders/AntiMaterial/antimaterial_speed_loader.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/bolt-open.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/bolt-open.png rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/bolt-open.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/equipped-BELT.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/equipped-BELT.png rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/icon.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/icon.png rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-left.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-left.png rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-right.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-right.png rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/meta.json b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi/meta.json rename to Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/rsh18.rsi/meta.json diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/bolt-open.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/bolt-open.png new file mode 100644 index 00000000000000..0e1fc4309dc120 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/bolt-open.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-BELT.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-BELT.png new file mode 100644 index 00000000000000..65f3aacd308807 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000000..65f3aacd308807 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/icon.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/icon.png new file mode 100644 index 00000000000000..0e1fc4309dc120 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/icon.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-left.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-left.png new file mode 100644 index 00000000000000..b9de61b5998acc Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-right.png b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-right.png new file mode 100644 index 00000000000000..3c08ed05a5c658 Binary files /dev/null and b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/meta.json b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/meta.json new file mode 100644 index 00000000000000..1faecd06b3b240 --- /dev/null +++ b/Resources/Textures/Starshine/Objects/Weapons/Guns/Revolvers/suppressor.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "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 + } + ] +}