From 649ded64d6ce4df62be5be37321726e58b811c07 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:56:29 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=BD=D0=BE=D0=B5=20(#?= =?UTF-8?q?385)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * - add: Meatspike changes. * - fix: Fix socks. * - remove: No light status. * - tweak: Raptor tweak. * - fix: Fix exception. * - remove: Remove unsexed. * - tweak: Crossbow tweak. * - add: More meatspike. * - tweak: Nerf buff rune. * - tweak: No throwing during incorporeal. * - add: Incorporeal magic cooldown. --- Content.Client/Popups/PopupSystem.cs | 9 +++-- .../_White/Animations/FlipOnHitSystem.cs | 3 ++ .../EntitySystems/KitchenSpikeSystem.cs | 32 ++++++++++++++---- .../Light/Components/PoweredLightComponent.cs | 3 -- .../Light/EntitySystems/PoweredLightSystem.cs | 9 ----- .../Systems/CultSystem.ConstructsAbilities.cs | 10 ++++++ .../IncorporealSystem/IncorporealSystem.cs | 22 +++++++++++- .../Wizard/Magic/Amaterasu/AmaterasuSystem.cs | 2 +- .../Components/KitchenSpikeComponent.cs | 2 +- .../Projectiles/SharedProjectileSystem.cs | 1 + .../Cult/Components/CultBuffComponent.cs | 6 ++-- .../components/kitchen-spike-component.ftl | 1 + .../Prototypes/DeviceLinking/source_ports.yml | 6 ---- .../Entities/Mobs/NPCs/miscellaneous.yml | 4 +-- .../Prototypes/Entities/Mobs/Species/base.yml | 2 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 20 +++++------ .../Structures/Lighting/base_lighting.yml | 10 ++---- .../Structures/Lighting/ground_lighting.yml | 3 -- .../Graphs/furniture/meatspike.yml | 8 ++--- Resources/Prototypes/Species/arachnid.yml | 2 -- .../Species/Arachnid/parts.rsi/torso_f.png | Bin 761 -> 512 bytes 21 files changed, 91 insertions(+), 64 deletions(-) diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index d24e2aff72..0ae91d64b3 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -93,11 +93,14 @@ namespace Content.Client.Popups _aliveWorldLabels.Add(label); - // START WhiteDream + // START WhiteDream if (!_isLogging) return; - if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity!.Value, coordinates, 10)) + if (_playerManager.LocalEntity == null) + return; + + if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity.Value, coordinates, 10)) return; var fontSizeDict = new Dictionary @@ -117,7 +120,7 @@ namespace Content.Client.Popups var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMEssage, GetNetEntity(EntityUid.Invalid), null); _uiManager.GetUIController().ProcessChatMessage(chatMsg); - + // END WhiteDream } diff --git a/Content.Client/_White/Animations/FlipOnHitSystem.cs b/Content.Client/_White/Animations/FlipOnHitSystem.cs index 5b02152b24..8eba1f8be6 100644 --- a/Content.Client/_White/Animations/FlipOnHitSystem.cs +++ b/Content.Client/_White/Animations/FlipOnHitSystem.cs @@ -32,6 +32,9 @@ public sealed class FlipOnHitSystem : SharedFlipOnHitSystem if (!_timing.IsFirstTimePredicted) return; + if (TerminatingOrDeleted(user)) + return; + if (_animationSystem.HasRunningAnimation(user, EmoteAnimationSystem.AnimationKey)) { EnsureComp(user); diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs index b145bec014..0521dd526c 100644 --- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs @@ -1,10 +1,13 @@ +using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Kitchen.Components; using Content.Server.Popups; +using Content.Shared.Body.Components; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.DragDrop; +using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -50,9 +53,21 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnButcherableCanDrop); } + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + var (uid, comp) = ent; + + if (comp.Victim is not "?" or "") + { + args.PushMarkup(Loc.GetString("comp-kitchen-spike-examine", ("this", uid), ("victim", comp.Victim))); + } + } + private void OnButcherableCanDrop(EntityUid uid, ButcherableComponent component, ref CanDropDraggedEvent args) { args.Handled = true; @@ -152,7 +167,8 @@ namespace Content.Server.Kitchen.EntitySystems // THE WHAT? // TODO: Need to be able to leave them on the spike to do DoT, see ss13. var gibs = _bodySystem.GibBody(victimUid); - foreach (var gib in gibs) { + foreach (var gib in gibs.Where(HasComp)) // WD EDIT + { QueueDel(gib); } @@ -236,21 +252,23 @@ namespace Content.Server.Kitchen.EntitySystems // THE WHAT? (again) // Prevent dead from being spiked TODO: Maybe remove when rounds can be played and DOT is implemented - if (Resolve(victimUid, ref mobState, false) && + /*if (Resolve(victimUid, ref mobState, false) && _mobStateSystem.IsAlive(victimUid, mobState)) { _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-deny-not-dead", ("victim", Identity.Entity(victimUid, EntityManager))), victimUid, userUid); return true; - } + }*/ + // WD EDIT if (userUid != victimUid) - { _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-victim", ("user", Identity.Entity(userUid, EntityManager)), ("this", uid)), victimUid, victimUid, PopupType.LargeCaution); - } // TODO: make it work when SuicideEvent is implemented - // else - // _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-self", ("this", uid)), victimUid, Filter.Pvs(uid)); // This is actually unreachable and should be in SuicideEvent + else + { + _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-begin-hook-self", ("this", uid)), victimUid, + victimUid); // This is actually unreachable and should be in SuicideEvent + } butcherable.BeingButchered = true; component.InUse = true; diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index fd331f459c..489a49eec2 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -63,9 +63,6 @@ namespace Content.Server.Light.Components [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer))] public string TogglePort = "Toggle"; - [DataField("statusPort", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string StatusPort = "LightStatus"; - /// /// How long it takes to eject a bulb from this /// diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 821dffc8c3..2765ddff5c 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -76,7 +76,6 @@ namespace Content.Server.Light.EntitySystems { light.LightBulbContainer = _containerSystem.EnsureContainer(uid, LightBulbContainer); _signalSystem.EnsureSinkPorts(uid, light.OnPort, light.OffPort, light.TogglePort); - _signalSystem.EnsureSourcePorts(uid, light.StatusPort); // WD } private void OnMapInit(EntityUid uid, PoweredLightComponent light, MapInitEvent args) @@ -447,14 +446,6 @@ namespace Content.Server.Light.EntitySystems light.On = !light.On; - // WD START - var data = new NetworkPayload - { - {DeviceNetworkConstants.LogicState, light.On ? SignalState.High : SignalState.Low} - }; - _signalSystem.InvokePort(uid, light.StatusPort, data); - // WD END - UpdateLight(uid, light); } diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs index ec080f7f28..401e7fcba6 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs @@ -12,6 +12,7 @@ using Content.Shared.Physics; using Content.Shared.StatusEffect; using Content.Shared._White.Cult; using Content.Shared._White.Cult.Components; +using Content.Shared.Throwing; namespace Content.Server._White.Cult.Runes.Systems; @@ -34,6 +35,7 @@ public partial class CultSystem SubscribeLocalEvent(OnWraithPhase); SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnThrowAttempt); SubscribeLocalEvent(OnJuggernautCreateWall); @@ -163,6 +165,14 @@ public partial class CultSystem } } + private void OnThrowAttempt(Entity ent, ref ThrowAttemptEvent args) + { + if (_statusEffectsSystem.HasStatusEffect(args.Uid, "Incorporeal")) + { + _statusEffectsSystem.TryRemoveStatusEffect(args.Uid, "Incorporeal"); + } + } + private void OnJuggernautCreateWall(JuggernautCreateWallActionEvent ev) { if (!TrySpawnWall(ev.Performer, ev.WallPrototypeId)) diff --git a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs index 932aa8a15a..a3b658e2ca 100644 --- a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs +++ b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs @@ -1,20 +1,25 @@ using System.Linq; +using Content.Server.Actions; +using Content.Shared._White.Wizard.Magic; +using Content.Shared.Actions; using Content.Shared.Eye; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; using Content.Shared.Movement.Systems; -using Content.Shared.Physics; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Robust.Server.GameObjects; using Robust.Shared.Physics; using Robust.Shared.Physics.Systems; +using Robust.Shared.Timing; namespace Content.Server._White.IncorporealSystem; public sealed class IncorporealSystem : EntitySystem { + [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; + [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly SharedStealthSystem _stealth = default!; @@ -78,6 +83,21 @@ public sealed class IncorporealSystem : EntitySystem _stealth.SetVisibility(uid, 1); RemComp(uid); _movement.RefreshMovementSpeedModifiers(uid); + if (!TryComp(uid, out ActionsContainerComponent? container)) + return; + + var cooldown = TimeSpan.FromSeconds(3); + + foreach (var action in container.Container.ContainedEntities.Where(HasComp)) + { + if (!_actions.TryGetActionData(action, out var comp, false)) + continue; + + if (comp.Cooldown.HasValue && comp.Cooldown.Value.End >= _timing.CurTime + cooldown) + continue; + + _actions.SetCooldown(action, cooldown); + } } private void OnRefresh(EntityUid uid, IncorporealComponent component, RefreshMovementSpeedModifiersEvent args) diff --git a/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs b/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs index 6c16a7f52f..633aada83d 100644 --- a/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs +++ b/Content.Server/_White/Wizard/Magic/Amaterasu/AmaterasuSystem.cs @@ -24,7 +24,7 @@ public sealed class AmaterasuSystem : EntitySystem if (flammable.OnFire) { - _bodySystem.GibBody(uid); + _bodySystem.GibBody(uid, true); return; } diff --git a/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs index 3057a75a4c..b0855e2f40 100644 --- a/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Kitchen.Components; public sealed partial class KitchenSpikeComponent : Component { [DataField("delay")] - public float SpikeDelay = 7.0f; + public float SpikeDelay = 2.0f; [ViewVariables(VVAccess.ReadWrite)] [DataField("sound")] diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index 6fa1b3910f..ba54be37b7 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -285,6 +285,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid) { DistanceThreshold = SharedInteractionSystem.InteractionRange, + CancelDuplicate = false }, doAfter); return true; diff --git a/Content.Shared/_White/Cult/Components/CultBuffComponent.cs b/Content.Shared/_White/Cult/Components/CultBuffComponent.cs index 914721de99..1743427ea9 100644 --- a/Content.Shared/_White/Cult/Components/CultBuffComponent.cs +++ b/Content.Shared/_White/Cult/Components/CultBuffComponent.cs @@ -4,13 +4,13 @@ namespace Content.Shared._White.Cult.Components; public sealed partial class CultBuffComponent : Component { [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan BuffTime = TimeSpan.FromSeconds(60); + public TimeSpan BuffTime = TimeSpan.FromSeconds(20); [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(60); + public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(20); [ViewVariables(VVAccess.ReadOnly), DataField] - public TimeSpan BuffLimit = TimeSpan.FromSeconds(55); + public TimeSpan BuffLimit = TimeSpan.FromSeconds(10); public static float NearbyTilesBuffRadius = 1f; diff --git a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl index 9fbd3c0aed..4d0e1ec825 100644 --- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl @@ -11,3 +11,4 @@ comp-kitchen-spike-knife-needed = Вам нужен нож для этого. comp-kitchen-spike-remove-meat = Вы срезаете немного мяса с { $victim }. comp-kitchen-spike-remove-meat-last = Вы срезаете последний кусок мяса с { $victim }! comp-kitchen-spike-meat-name = мясо { $victim } +comp-kitchen-spike-examine = На { CAPITALIZE($this) } висит туша { CAPITALIZE($victim) }. diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index fee5dcd4cc..373484d5f9 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -156,12 +156,6 @@ description: Передатчик сигнала ХимМастера # WD -- type: sourcePort - id: LightStatus - name: Статус светильника - description: Этот порт вызывается всякий раз, когда меняется статус светильника - defaultLinks: [ Toggle ] - - type: sourcePort id: BodyScannerSender name: Сканер тела diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index 9cb449e3d6..e1dfa88016 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -1,7 +1,7 @@ - type: entity name: laser raptor id: MobLaserRaptor - parent: SimpleMobBase + parent: SimpleSpaceMobBase description: From the Viking age. components: - type: NpcFactionMember @@ -36,7 +36,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead + 50: Dead - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 5 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index eed469a20d..f18f3b8093 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -29,10 +29,10 @@ visible: false - map: [ "underwearb" ] #White - map: [ "underweart" ] #White - - map: ["jumpsuit"] - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "socks" ] #White + - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] - map: [ "gloves" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index be81839e43..bf7fb11a17 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -74,8 +74,6 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] - - map: [ "underwearb" ] #White - - map: [ "underweart" ] #White - shader: StencilClear sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. @@ -86,17 +84,14 @@ sprite: Mobs/Customization/masking_helpers.rsi state: unisex_full visible: false - - map: [ "jumpsuit" ] - - map: [ "enum.HumanoidVisualLayers.LHand" ] - - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "underwearb" ] #White + - map: [ "underweart" ] #White - map: [ "enum.HumanoidVisualLayers.LFoot" ] - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "socks" ] #White - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] @@ -115,6 +110,11 @@ - map: [ "head" ] - map: [ "pocket1" ] - map: [ "pocket2" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false - map: [ "clownedon" ] # Dynamically generated sprite: "Effects/creampie.rsi" state: "creampie_moth" diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 25e9e4cda5..dae0b2956e 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -40,7 +40,7 @@ - type: RCDDeconstructable cost: 4 delay: 2 - fx: EffectRCDDeconstruct2 + fx: EffectRCDDeconstruct2 - type: Destructible thresholds: - trigger: @@ -72,7 +72,7 @@ mode: SnapgridCenter snap: - Wallmount - + - type: entity name: light description: "A light fixture. Draws power and produces light when equipped with a light tube." @@ -100,9 +100,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: DeviceLinkSink ports: - On @@ -294,9 +291,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: Appearance - type: PoweredLightVisuals - type: DeviceLinkSink diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 72f03a2e0f..c9a0eab15c 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -87,9 +87,6 @@ receiveFrequencyId: SmartLight - type: WirelessNetworkConnection range: 200 - - type: DeviceLinkSource - ports: - - LightStatus - type: DeviceLinkSink ports: - On diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml index 02e141826c..8519ce0685 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml @@ -12,8 +12,8 @@ southRotation: true steps: - material: Steel - amount: 15 - doAfter: 2 + amount: 5 + doAfter: 5 - node: MeatSpike entity: KitchenSpike edges: @@ -21,7 +21,7 @@ completed: - !type:SpawnPrototype prototype: SheetSteel1 - amount: 15 + amount: 5 steps: - tool: Screwing - doAfter: 1 + doAfter: 5 diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 090a334871..8f0e6245b9 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -13,8 +13,6 @@ femaleFirstNames: names_arachnid_first maleLastNames: names_arachnid_last femaleLastNames: names_arachnid_last - sexes: - - Unsexed - type: markingPoints id: MobArachnidMarkingLimits diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png index 10f3a3b0e4c0922e4b8cf0630b8658f005980576..fdc9d235e643499e4dc710b3d13c0998b7279034 100644 GIT binary patch delta 497 zcmVzu*U?a&E8UlE=WDEUnT%@!+=5O6?RG_{r zb|b%fmQNq+zkhtGCMsC(;PG*(FM!feK}%i%{ZWDX0{C753fNV!3YdfnTESnj0l+V9 z2XNbM0TEP|Pv36bF?*Cp|EL2v0O|k^fcjqm!)MjYwPD&dI-@2{GPDJJc(bx#jOMI4 zF;d6}pyr=t!wG;fk`yCFKF=39;5mY103!eaI{*W41ZtYIVx-u0XvcIRoDW`K~#90?V2&p;xG_}AFGujMSo$rbVtgF zhMtr80673>qNhs;q*LEo*l$@+g&jaX|#5C|zHthK?&l8_dF5PZ^pl^s*e4uCNRLWrlRlL6;k zuNHh7V+_3a0Dm5Lp1j1Kj4>~_=oqsD&~+W!w(S)^in?d&qL$K!DW0A*Q12+>P>Aq2{@?5+DWu|5&s?Ogrj8bE0XJZHcfkk0TioU1=O z1BkLL;l1x=fcL(4XO@IAFec8xRI)OlEX!WyrJ$@qtbY?1z+C<001zacT6N!rGJu{o z-uqA#bG#&P0TKn!GqE;GDHvnk{^6Bev9;FsF;Qd8qW=Si`o z7=~dOhG7_nVHoDiNuCdAnr5T5z6&9sl!9{(*XtEUQLOe(PHTO?-EP=!x4pI)d0V7C z4j>5Bb$^ZBZU^A;ZayAXSZb1Ec<%jv9~vaP-41nKBlY5ej0~vjy4Q~f9xbxV<+93~ zS$Zp6Rn^nHfVDPxKqIR!V66?})QlL;3@iz0k#_7SmDvFpOKs}U=Ze3BwYJw9i@QQ8 z+i-ROhG{h%PFOPtarVW75>sAZk+lV;CN$RMQ)M2q0x%RFwyW3RQy#Kvz%c5+l>uX3 zfQ4(oSk%|v24mW>hsA3^Y~;6j*F$murbf}08jqXuFeG% Date: Wed, 26 Jun 2024 11:56:38 +0000 Subject: [PATCH 02/11] Fix fixgridatmos command (#27113) (#384) Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> --- .../AtmosphereSystem.Commands.cs | 81 +++++++++++++------ .../AtmosphereSystem.Processing.cs | 8 +- 2 files changed, 60 insertions(+), 29 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs index a5e37398c6..f711b235af 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs @@ -3,6 +3,7 @@ using Content.Server.Administration; using Content.Server.Atmos.Components; using Content.Shared.Administration; using Content.Shared.Atmos; +using Content.Shared.Atmos.Components; using Robust.Shared.Console; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -84,44 +85,72 @@ public sealed partial class AtmosphereSystem continue; } - var transform = Transform(euid.Value); + // Force Invalidate & update air on all tiles + Entity grid = + new(euid.Value, gridAtmosphere, Comp(euid.Value), gridComp, Transform(euid.Value)); - foreach (var (indices, tileMain) in gridAtmosphere.Tiles) + RebuildGridTiles(grid); + + var query = GetEntityQuery(); + foreach (var (indices, tile) in gridAtmosphere.Tiles.ToArray()) { - var tile = tileMain.Air; - if (tile == null) + if (tile.Air is not {Immutable: false} air) continue; - if (!_mapSystem.TryGetTile(gridComp, indices, out var gTile) || gTile.IsEmpty) - { - gridAtmosphere.Tiles.Remove(indices); - continue; - } - - if (tile.Immutable && !IsTileSpace(euid, transform.MapUid, indices)) - { - tile = new GasMixture(tile.Volume) { Temperature = tile.Temperature }; - tileMain.Air = tile; - } - - tile.Clear(); + air.Clear(); var mixtureId = 0; - foreach (var entUid in gridComp.GetAnchoredEntities(indices)) + var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(grid, grid, indices); + while (enumerator.MoveNext(out var entUid)) { - if (!TryComp(entUid, out AtmosFixMarkerComponent? afm)) - continue; - mixtureId = afm.Mode; - break; + if (query.TryComp(entUid, out var marker)) + mixtureId = marker.Mode; } - var mixture = mixtures[mixtureId]; - Merge(tile, mixture); - tile.Temperature = mixture.Temperature; - gridAtmosphere.InvalidatedCoords.Add(indices); + var mixture = mixtures[mixtureId]; + Merge(air, mixture); + air.Temperature = mixture.Temperature; } } } + /// + /// Clears & re-creates all references to s stored on a grid. + /// + private void RebuildGridTiles( + Entity ent) + { + foreach (var indices in ent.Comp1.Tiles.Keys) + { + InvalidateVisuals((ent, ent), indices); + } + + var atmos = ent.Comp1; + atmos.MapTiles.Clear(); + atmos.ActiveTiles.Clear(); + atmos.ExcitedGroups.Clear(); + atmos.HotspotTiles.Clear(); + atmos.SuperconductivityTiles.Clear(); + atmos.HighPressureDelta.Clear(); + atmos.CurrentRunTiles.Clear(); + atmos.CurrentRunExcitedGroups.Clear(); + atmos.InvalidatedCoords.Clear(); + atmos.CurrentRunInvalidatedTiles.Clear(); + atmos.PossiblyDisconnectedTiles.Clear(); + atmos.Tiles.Clear(); + + var volume = GetVolumeForTiles(ent); + TryComp(ent.Comp4.MapUid, out MapAtmosphereComponent? mapAtmos); + + var enumerator = _map.GetAllTilesEnumerator(ent, ent); + while (enumerator.MoveNext(out var tileRef)) + { + var tile = GetOrNewTile(ent, ent, tileRef.Value.GridIndices); + UpdateTileData(ent, mapAtmos, tile); + UpdateAdjacentTiles(ent, tile, activate: true); + UpdateTileAir(ent, tile, volume); + } + } + private CompletionResult FixGridAtmosCommandCompletions(IConsoleShell shell, string[] args) { MapId? playerMap = null; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs index bd023e8574..85b1a93e20 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs @@ -30,13 +30,15 @@ namespace Content.Server.Atmos.EntitySystems private int _currentRunAtmosphereIndex; private bool _simulationPaused; - private TileAtmosphere GetOrNewTile(EntityUid owner, GridAtmosphereComponent atmosphere, Vector2i index) + private TileAtmosphere GetOrNewTile(EntityUid owner, GridAtmosphereComponent atmosphere, Vector2i index, bool invalidateNew = true) { var tile = atmosphere.Tiles.GetOrNew(index, out var existing); if (existing) return tile; - atmosphere.InvalidatedCoords.Add(index); + if (invalidateNew) + atmosphere.InvalidatedCoords.Add(index); + tile.GridIndex = owner; tile.GridIndices = index; return tile; @@ -68,7 +70,7 @@ namespace Content.Server.Atmos.EntitySystems atmosphere.CurrentRunInvalidatedTiles.EnsureCapacity(atmosphere.InvalidatedCoords.Count); foreach (var indices in atmosphere.InvalidatedCoords) { - var tile = GetOrNewTile(uid, atmosphere, indices); + var tile = GetOrNewTile(uid, atmosphere, indices, invalidateNew: false); atmosphere.CurrentRunInvalidatedTiles.Enqueue(tile); // Update tile.IsSpace and tile.MapAtmosphere, and tile.AirtightData. From 789391b834ebb4cd785eeac509f3df275f8b2118 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Wed, 26 Jun 2024 11:57:32 +0000 Subject: [PATCH 03/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index aaba395c62..8623b1d69d 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -4933,3 +4933,50 @@ id: 326 time: '2024-06-26T02:13:42.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/378 +- author: Aviu + changes: + - message: "\u041D\u0430 \u043C\u044F\u0441\u043D\u043E\u0439 \u043A\u0440\u044E\ + \u043A \u043C\u043E\u0436\u043D\u043E \u043F\u043E\u0432\u0435\u0441\u0438\u0442\ + \u044C \u0436\u0438\u0432\u044B\u0445 \u0446\u0435\u043B\u0435\u0439, \u0432\ + \ \u0442\u043E\u043C \u0447\u0438\u0441\u043B\u0435 \u0438 \u0441\u0435\u0431\ + \u044F, \u0434\u0443\u0430\u0444\u0442\u0435\u0440 \u0443\u043C\u0435\u043D\u044C\ + \u0448\u0435\u043D." + type: Add + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\ + \ \u0443\u0437\u043D\u0430\u0442\u044C, \u0447\u044C\u044F \u0442\u0443\u0448\ + \u0430 \u0432\u0438\u0441\u0438\u0442 \u043D\u0430 \u043C\u044F\u0441\u043D\u043E\ + \u043C \u043A\u0440\u044E\u043A\u0435, \u0435\u0441\u043B\u0438 \u043E\u0441\ + \u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0435\u0433\u043E." + type: Add + - message: "\u041F\u0440\u0438 \u0432\u044B\u0445\u043E\u0434\u0435 \u0438\u0437\ + \ \u043F\u043E\u0442\u0443\u0441\u0442\u043E\u0440\u043E\u043D\u043D\u0435\u0433\ + \u043E \u043F\u0443\u0442\u0435\u0448\u0435\u0441\u0442\u0432\u0438\u044F \u0432\ + \u0441\u044F \u043C\u0430\u0433\u0438\u044F \u0443\u0445\u043E\u0434\u0438\u0442\ + \ \u0432 \u043A\u0434 \u043D\u0430 3 \u0441\u0435\u043A\u0443\u043D\u0434\u044B\ + ." + type: Add + - message: "\u0423 \u0430\u0440\u0430\u0445\u043D\u0438\u0434\u043E\u0432 \u0442\ + \u0435\u043F\u0435\u0440\u044C \u0435\u0441\u0442\u044C \u043F\u043E\u043B." + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u0432\u043E\u0437\u043C\u043E\u0436\ + \u043D\u043E\u0441\u0442\u044C \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\ + \u0442\u044C \u0441\u0442\u0430\u0442\u0443\u0441 \u0441\u0432\u0435\u0442\u0430\ + ." + type: Remove + - message: "\u041F\u0440\u0438 \u043F\u043E\u043F\u044B\u0442\u043A\u0435 \u0431\ + \u0440\u043E\u0441\u0438\u0442\u044C \u0447\u0442\u043E-\u043B\u0438\u0431\u043E\ + \ \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436 \u0432\u044B\u0445\u043E\u0434\ + \u0438\u0442 \u0438\u0437 \u043F\u043E\u0442\u0443\u0441\u0442\u043E\u0440\u043E\ + \u043D\u043D\u0435\u0433\u043E \u043F\u0443\u0442\u0435\u0448\u0435\u0441\u0442\ + \u0432\u0438\u044F." + type: Tweak + - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0432\u0440\u0435\ + \u043C\u044F \u0431\u0430\u0444\u0444\u0430 \u0441 \u0440\u0443\u043D\u044B\ + \ \u0434\u043E 20 \u0441\u0435\u043A\u043D\u0443\u0434." + type: Tweak + - message: "\u0424\u0438\u043A\u0441 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\ + \u043D\u0438\u044F \u043D\u043E\u0441\u043A\u043E\u0432." + type: Fix + id: 327 + time: '2024-06-26T11:56:29.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/385 From 2cdf178447d60dc54c3e0ad9166e7337e717d293 Mon Sep 17 00:00:00 2001 From: RinKeeper <161238702+RinKeeper@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:59:13 +0300 Subject: [PATCH 04/11] wizard admin verb (#374) * done * oops * some wizard rule tweaks * Update WizardRuleSystem.cs resolve --- .../Systems/AdminVerbSystem.Antags.cs | 19 ++++- .../_White/Wizard/WizardRuleSystem.cs | 76 ++++++++++++++++++- .../Locale/en-US/administration/antag.ftl | 2 + .../Locale/ru-RU/administration/antag.ftl | 2 + 4 files changed, 94 insertions(+), 5 deletions(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 1e7c32851a..604a6f922f 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -9,6 +9,7 @@ using Content.Shared.Verbs; using Robust.Shared.Player; using Robust.Shared.Utility; using Content.Server._White.Cult.GameRule; +using Content.Server._White.Wizard; namespace Content.Server.Administration.Systems; @@ -22,6 +23,7 @@ public sealed partial class AdminVerbSystem [Dependency] private readonly PiratesRuleSystem _piratesRule = default!; [Dependency] private readonly RevolutionaryRuleSystem _revolutionaryRule = default!; [Dependency] private readonly CultRuleSystem _cultRule = default!; + [Dependency] private readonly WizardRuleSystem _wizardRule = default!; // All antag verbs have names so invokeverb works. private void AddAntagVerbs(GetVerbsEvent args) @@ -150,8 +152,21 @@ public sealed partial class AdminVerbSystem Impact = LogImpact.High, Message = Loc.GetString("admin-verb-make-changeling"), }; - args.Verbs.Add(changeling); - //WD edit end + + Verb wizard = new() + { + Text = Loc.GetString("admin-verb-text-make-wizard"), + Category = VerbCategory.Antag, + Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png")), + Act = () => + { + _wizardRule.AdminMakeWizard(args.Target); + }, + Impact = LogImpact.High, + Message = Loc.GetString("admin-verb-make-wizard"), + }; + args.Verbs.Add(wizard); } + //WD edit end } diff --git a/Content.Server/_White/Wizard/WizardRuleSystem.cs b/Content.Server/_White/Wizard/WizardRuleSystem.cs index 46ef0bcbcb..0f511c52b8 100644 --- a/Content.Server/_White/Wizard/WizardRuleSystem.cs +++ b/Content.Server/_White/Wizard/WizardRuleSystem.cs @@ -300,10 +300,10 @@ public sealed class WizardRuleSystem : GameRuleSystem _npcFaction.AddFaction(mob, "Wizard"); } - private void SpawnWizard(ICommonSession? session, WizardRuleComponent component, bool spawnGhostRoles = true) + private EntityCoordinates WizardSpawnPoint(WizardRuleComponent component) { if (component.ShuttleMap is not {Valid: true} mapUid) - return; + return EntityCoordinates.Invalid; var spawn = new EntityCoordinates(); foreach (var (_, meta, xform) in EntityQuery(true)) @@ -318,13 +318,25 @@ public sealed class WizardRuleSystem : GameRuleSystem break; } - //Fallback, spawn at the centre of the map + // Fallback, spawn at the centre of the map if (spawn == new EntityCoordinates()) { spawn = Transform(mapUid).Coordinates; _sawmill.Warning("Fell back to default spawn for wizard!"); } + return spawn; + } + + private void SpawnWizard(ICommonSession? session, WizardRuleComponent component, bool spawnGhostRoles = true) + { + var spawn = WizardSpawnPoint(component); + if (spawn == EntityCoordinates.Invalid) + { + _sawmill.Error("Failed to calculate wizard spawn point"); + return; + } + var wizardAntag = _prototypeManager.Index(component.WizardRoleProto); //If a session is available, spawn mob and transfer mind into it @@ -395,4 +407,62 @@ public sealed class WizardRuleSystem : GameRuleSystem ICommonSession? session = null; SpawnWizard(session, component, true); } + + /// + /// Makes mob a wizard through admin verb button + /// + public void AdminMakeWizard(EntityUid uid) + { + var rule = EntityQuery().FirstOrDefault(); + + if (rule == null) + { + GameTicker.StartGameRule("Wizard", out var ruleEntity); + rule = Comp(ruleEntity); + } + + if (HasComp(uid)) + return; + + MakeWizard(uid, rule, true); + } + + private bool MakeWizard(EntityUid wizard, WizardRuleComponent rule, + bool giveObjectives = true) + { + if (!_mind.TryGetMind(wizard, out var mindId, out var mind)) + { + Log.Info("Failed getting mind for picked wizard."); + return false; + } + + if (HasComp(mindId)) + { + Log.Error($"Player {mind.CharacterName} is already a wizard."); + return false; + } + + HumanoidCharacterProfile? profile = null; + if (TryComp(wizard, out ActorComponent? actor)) + profile = _prefs.GetPreferences(actor.PlayerSession.UserId).SelectedCharacter as HumanoidCharacterProfile; + + if (giveObjectives) + { + AddRole(mindId, mind, rule); + } + + if (!_prototypeManager.TryIndex(rule.StartingGear, out var gear)) + { + _sawmill.Error("Failed to load wizard gear prototype"); + return false; + } + + SetupWizardEntity(wizard, rule.Points, gear, profile); + + var spawnpoint = WizardSpawnPoint(rule); + var transform = EnsureComp(wizard); + transform.Coordinates = spawnpoint; + + return true; + } } diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl index 1375969e79..09dc3980d5 100644 --- a/Resources/Locale/en-US/administration/antag.ftl +++ b/Resources/Locale/en-US/administration/antag.ftl @@ -6,6 +6,7 @@ admin-verb-make-nuclear-operative = Make target into a lone Nuclear Operative. admin-verb-make-pirate = Make the target into a pirate. Note this doesn't configure the game rule. admin-verb-make-head-rev = Make the target into a Head Revolutionary. admin-verb-make-thief = Make the target into a thief. +admin-verb-make-wizard = Make the target into a wizard. admin-verb-text-make-traitor = Make Traitor admin-verb-text-make-changeling = Make Changeling @@ -14,3 +15,4 @@ admin-verb-text-make-nuclear-operative = Make Nuclear Operative admin-verb-text-make-pirate = Make Pirate admin-verb-text-make-head-rev = Make Head Rev admin-verb-text-make-thief = Make Thief +admin-verb-text-make-wizard = Make wizard diff --git a/Resources/Locale/ru-RU/administration/antag.ftl b/Resources/Locale/ru-RU/administration/antag.ftl index b444bf66fc..6bcbafe193 100644 --- a/Resources/Locale/ru-RU/administration/antag.ftl +++ b/Resources/Locale/ru-RU/administration/antag.ftl @@ -6,6 +6,7 @@ admin-verb-make-nuclear-operative = Сделать цель одиноким Я admin-verb-make-pirate = Сделать цель пиратом\капером. Учтите, что это не меняет игровой режим. admin-verb-make-head-rev = Сделать цель главой революции. admin-verb-make-thief = Сделать цель вором. +admin-verb-make-wizard = Сделать цель магом. admin-verb-text-make-traitor = Сделать предателем admin-verb-text-make-changeling = Сделать генокрадом @@ -14,3 +15,4 @@ admin-verb-text-make-nuclear-operative = Сделать одиноким яде admin-verb-text-make-pirate = Сделать пиратом admin-verb-text-make-head-rev = Сделать главой революции admin-verb-text-make-thief = Сделать вором +admin-verb-text-make-wizard = Сделать магом From 288c1ec226206b41888e6c9959ae0067d5ec26f2 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Thu, 27 Jun 2024 06:00:16 +0000 Subject: [PATCH 05/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 8623b1d69d..7f0118f54c 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -4980,3 +4980,12 @@ id: 327 time: '2024-06-26T11:56:29.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/385 +- author: RinKeeper + changes: + - message: "\u041A\u043D\u043E\u043F\u043A\u0430 \u0441\u0434\u0435\u043B\u0430\u0442\ + \u044C \u043C\u0430\u0433\u043E\u043C \u0434\u043B\u044F \u043F\u0435\u0434\u0430\ + \u043B\u0435\u0439" + type: Add + id: 328 + time: '2024-06-27T05:59:13.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/374 From 630ebae42a10ec996a67265300f97058ec309c7c Mon Sep 17 00:00:00 2001 From: RinKeeper <161238702+RinKeeper@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:22:16 +0300 Subject: [PATCH 06/11] oioioi (#386) --- Content.Server/_White/Wizard/WizardRuleSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/_White/Wizard/WizardRuleSystem.cs b/Content.Server/_White/Wizard/WizardRuleSystem.cs index 0f511c52b8..491278e51b 100644 --- a/Content.Server/_White/Wizard/WizardRuleSystem.cs +++ b/Content.Server/_White/Wizard/WizardRuleSystem.cs @@ -457,7 +457,7 @@ public sealed class WizardRuleSystem : GameRuleSystem return false; } - SetupWizardEntity(wizard, rule.Points, gear, profile); + SetupWizardEntity(wizard, gear, profile, false); var spawnpoint = WizardSpawnPoint(rule); var transform = EnsureComp(wizard); From 70489133368731a5d7d4fd817eb60dca00e781e1 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:37:42 +0300 Subject: [PATCH 07/11] =?UTF-8?q?=D0=A0=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D0=BC=D0=BE=D1=82=D1=80=20=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D0=BB=D0=B8=D1=89=20=D1=81=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D0=B0=D0=BC=D0=B8=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add: fixed wrong item rotation in inventory * fix: forcepreset no longer starts round * fix: fix localisation * add: forcepreset command logging * add: Storage and items rework, part 1 * rework: item size rework part 2 * add: blood loss accent rework * no spaces --- .../Body/Systems/BloodstreamSystem.cs | 6 +- .../Commands/ForcePresetCommand.cs | 21 +++++- .../Accent/Bloodloss/BloodLossAccent.cs | 66 +++++++++++++++++++ .../Bloodloss/BloodLossAccentComponent.cs | 13 ++++ Resources/Locale/ru-RU/hands/hands-system.ftl | 4 +- .../Catalog/Fills/Boxes/general.yml | 6 +- .../Catalog/Fills/Boxes/medical.yml | 2 +- .../Clothing/Belt/base_clothingbelt.yml | 4 +- .../Entities/Clothing/Belt/belts.yml | 4 +- .../Entities/Clothing/Neck/mantles.yml | 24 +++++-- .../Entities/Clothing/Neck/ties.yml | 16 ++++- .../Entities/Clothing/OuterClothing/armor.yml | 2 +- .../Entities/Clothing/OuterClothing/suits.yml | 2 + .../Clothing/Shoes/base_clothingshoes.yml | 1 + .../Entities/Debugging/spanisharmyknife.yml | 2 + .../Entities/Mobs/NPCs/elemental.yml | 1 + .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 1 + .../Entities/Mobs/NPCs/simplemob.yml | 2 + .../Entities/Mobs/Player/terminator.yml | 1 + .../Prototypes/Entities/Mobs/Species/base.yml | 2 + .../Objects/Consumable/Food/produce.yml | 4 ++ .../Objects/Devices/Electronics/triggers.yml | 2 +- .../Objects/Devices/forensic_scanner.yml | 1 + .../Entities/Objects/Devices/payload.yml | 2 + .../Entities/Objects/Devices/pinpointer.yml | 1 + .../Objects/Materials/Sheets/glass.yml | 4 +- .../Objects/Materials/Sheets/metal.yml | 2 +- .../Objects/Materials/Sheets/other.yml | 2 +- .../Entities/Objects/Misc/dat_fukken_disk.yml | 2 + .../Entities/Objects/Power/powercells.yml | 4 +- .../Objects/Specific/Chemistry/chem_bag.yml | 4 +- .../Objects/Specific/Hydroponics/tools.yml | 4 +- .../Objects/Specific/Janitorial/janitor.yml | 3 + .../Objects/Specific/Medical/healing.yml | 5 +- .../Objects/Specific/Medical/hypospray.yml | 3 + .../Objects/Specific/Medical/medkits.yml | 4 +- .../Objects/Specific/Research/disk.yml | 4 ++ .../Entities/Objects/Specific/chemistry.yml | 6 +- .../Entities/Objects/Specific/syndicate.yml | 1 + .../Entities/Objects/Tools/gas_tanks.yml | 10 +++ .../Entities/Objects/Tools/jetpacks.yml | 2 + .../Entities/Objects/Tools/spray_painter.yml | 1 + .../Entities/Objects/Tools/toolbox.yml | 4 +- .../Entities/Objects/Tools/tools.yml | 1 + .../Weapons/Guns/Battery/battery_guns.yml | 4 ++ .../Weapons/Guns/Launchers/launchers.yml | 2 + .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 + .../Objects/Weapons/Guns/Snipers/snipers.yml | 2 + .../Entities/Objects/Weapons/Melee/knife.yml | 3 + .../Entities/Objects/Weapons/Melee/spear.yml | 5 +- .../Entities/Objects/Weapons/Melee/sword.yml | 3 + .../Entities/Objects/Weapons/security.yml | 3 + .../Entities/Virtual/virtual_item.yml | 1 + .../Entities/White/voice_recorder.yml | 1 + Resources/Prototypes/_White/Economy/card.yml | 2 + Resources/Prototypes/item_size.yml | 2 + Resources/Prototypes/status_effects.yml | 5 +- 57 files changed, 252 insertions(+), 39 deletions(-) create mode 100644 Content.Server/_White/Accent/Bloodloss/BloodLossAccent.cs create mode 100644 Content.Server/_White/Accent/Bloodloss/BloodLossAccentComponent.cs diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index 99da767289..d18b83a81c 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -1,3 +1,4 @@ +using Content.Server._White.Accent.Bloodloss; using Content.Server.Body.Components; using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Chemistry.ReactionEffects; @@ -43,6 +44,7 @@ public sealed class BloodstreamSystem : EntitySystem [Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly ForensicsSystem _forensicsSystem = default!; [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; // WD + [Dependency] private readonly BloodLossAccent _bloodLossAccent = default!; public override void Initialize() { @@ -158,7 +160,7 @@ public sealed class BloodstreamSystem : EntitySystem uid, (float) bloodstream.UpdateInterval.TotalSeconds * 2, applySlur: false); - _stutteringSystem.DoStutter(uid, bloodstream.UpdateInterval * 2, refresh: false); + _bloodLossAccent.StartBloodLossAccent(uid, bloodstream.UpdateInterval * 2, refresh: false); // storing the drunk and stutter time so we can remove it independently from other effects additions bloodstream.StatusTime += bloodstream.UpdateInterval * 2; @@ -173,7 +175,7 @@ public sealed class BloodstreamSystem : EntitySystem // Remove the drunk effect when healthy. Should only remove the amount of drunk and stutter added by low blood level _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime.TotalSeconds); - _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime.TotalSeconds); + _bloodLossAccent.StopBloodLossAccent(uid, bloodstream.StatusTime.TotalSeconds); // Reset the drunk and stutter time to zero bloodstream.StatusTime = TimeSpan.Zero; } diff --git a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs index 1041fed6ec..92faeb3a4c 100644 --- a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs @@ -1,7 +1,10 @@ using System.Linq; using Content.Server.Administration; +using Content.Server.Administration.Logs; +using Content.Server.Chat.Managers; using Content.Server.GameTicking.Presets; using Content.Shared.Administration; +using Content.Shared.Database; using Robust.Shared.Console; using Robust.Shared.Prototypes; @@ -10,6 +13,9 @@ namespace Content.Server.GameTicking.Commands [AdminCommand(AdminFlags.Round)] sealed class ForcePresetCommand : IConsoleCommand { + [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly IChatManager _chatManager = default!; + public string Command => "forcepreset"; public string Description => "Forces a specific game preset to start for the current lobby."; public string Help => $"Usage: {Command} "; @@ -36,8 +42,19 @@ namespace Content.Server.GameTicking.Commands return; } - ticker.SetGamePreset(type, true); - shell.WriteLine($"Forced the game to start with preset {name}."); + ticker.SetGamePreset(type); + + _adminLogger.Add(LogType.EventStarted, $"Forced {type.ID} for secret."); + + + var player = "Someone"; + + if (shell.Player != null) + player = shell.Player.Name; + + _chatManager.SendAdminAnnouncement($"{player} forced {type.ID} for secret."); + shell.WriteLine($"forced the game to start with preset {name}."); + ticker.UpdateInfoText(); } diff --git a/Content.Server/_White/Accent/Bloodloss/BloodLossAccent.cs b/Content.Server/_White/Accent/Bloodloss/BloodLossAccent.cs new file mode 100644 index 0000000000..9c88736da2 --- /dev/null +++ b/Content.Server/_White/Accent/Bloodloss/BloodLossAccent.cs @@ -0,0 +1,66 @@ +using System.Text; +using Content.Server.Speech; +using Content.Shared.StatusEffect; +using Robust.Shared.Random; + +namespace Content.Server._White.Accent.Bloodloss; + +public sealed class BloodLossAccent : EntitySystem +{ + [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnAccent); + } + + public void StartBloodLossAccent(EntityUid uid, TimeSpan time, bool refresh, StatusEffectsComponent? status = null) + { + if (!Resolve(uid, ref status, false)) + return; + + _statusEffectsSystem.TryAddStatusEffect(uid, "BloodLoss", time, refresh, status); + } + + public void StopBloodLossAccent(EntityUid uid, double timeRemoved) + { + _statusEffectsSystem.TryRemoveTime(uid, "BloodLoss", TimeSpan.FromSeconds(timeRemoved)); + } + + private void OnAccent(EntityUid uid, BloodLossAccentComponent component, AccentGetEvent args) + { + args.Message = Accentuate(args.Message, component); + } + + public string Accentuate(string message, BloodLossAccentComponent component) + { + if (string.IsNullOrEmpty(message)) + { + return message; + } + + var result = new StringBuilder(); + string[] words = message.Split(' '); + + foreach (var word in words) + { + if (word.Length >= 3 && _random.NextDouble() < component.ReplaceProb) + { + int start = Random.Shared.Next(1, word.Length - 1); + int end = start + Random.Shared.Next(1, word.Length - start); + + result.Append(word.Substring(0, start) + component.ToReplace + word.Substring(end)); + } + else + { + result.Append(word); + } + + result.Append(' '); + } + + return result.ToString().TrimEnd(); + } +} diff --git a/Content.Server/_White/Accent/Bloodloss/BloodLossAccentComponent.cs b/Content.Server/_White/Accent/Bloodloss/BloodLossAccentComponent.cs new file mode 100644 index 0000000000..eb51fe3b35 --- /dev/null +++ b/Content.Server/_White/Accent/Bloodloss/BloodLossAccentComponent.cs @@ -0,0 +1,13 @@ +namespace Content.Server._White.Accent.Bloodloss; + +[RegisterComponent] +public sealed partial class BloodLossAccentComponent : Component +{ + [DataField] + [ViewVariables(VVAccess.ReadWrite)] + public float ReplaceProb = 0.6f; + + [DataField] + [ViewVariables(VVAccess.ReadWrite)] + public string ToReplace = "..."; +} diff --git a/Resources/Locale/ru-RU/hands/hands-system.ftl b/Resources/Locale/ru-RU/hands/hands-system.ftl index eea248cbb5..d5aa577cc0 100644 --- a/Resources/Locale/ru-RU/hands/hands-system.ftl +++ b/Resources/Locale/ru-RU/hands/hands-system.ftl @@ -3,8 +3,8 @@ hands-system-missing-equipment-slot = У вас нет { $slotName }, из которого можно что-то взять! hands-system-empty-equipment-slot = В вашем { $slotName } нет ничего, что можно было бы вынуть! # Examine text after when they're holding something (in-hand) -comp-hands-examine-empty = { CAPITALIZE(SUBJECT($user)) } ничего не удерживает. +comp-hands-examine-empty = { CAPITALIZE(SUBJECT($user)) } ничего не держит. comp-hands-examine-wrapper = [color=paleturquoise]{$item}[/color] -comp-hands-examine = { CAPITALIZE(SUBJECT($user)) } удерживает { $items }. +comp-hands-examine = { CAPITALIZE(SUBJECT($user)) } держит { $items }. hands-system-blocked-by = Руки заблокированы этим: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a50fc01ecf..59d5056ec2 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -5,9 +5,9 @@ description: A cardboard box for storing things. components: - type: Item - size: Large - shape: - - 0,0,2,2 + size: Normal + shape: + - 0,0,1,1 - type: Storage maxItemSize: Small grid: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 9862399776..0ab4114040 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -7,7 +7,7 @@ - type: StorageFill contents: - id: Syringe - amount: 6 + amount: 4 - type: Sprite layers: - state: box diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index 76aca4df13..1d32df423a 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -27,7 +27,9 @@ grid: - 0,0,7,1 - type: Item - size: Ginormous + size: Large + shape: + - 0, 0, 4, 1 - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 6c9104f6bf..dd823827da 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -548,7 +548,9 @@ - type: Clothing sprite: Clothing/Belt/sheath.rsi - type: Item - size: Ginormous + size: Huge + shape: + - 0, 0, 4, 0 - type: ItemSlots slots: item: diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 7d53f499b4..cdb7acd303 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -1,5 +1,15 @@ - type: entity parent: ClothingNeckBase + id: ClothingNeckMantleBase + abstract: true + name: base mantle + description: based + components: + - type: Item + storedRotation: -90 + +- type: entity + parent: ClothingNeckMantleBase id: ClothingNeckMantleCap name: captain's mantle description: A comfortable and chique mantle befitting of only the most experienced captain. @@ -10,7 +20,7 @@ sprite: Clothing/Neck/mantles/capmantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleCE name: chief engineer's mantle description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle. @@ -21,7 +31,7 @@ sprite: Clothing/Neck/mantles/cemantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleCMO name: chief medical officer's mantle description: For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over. @@ -32,7 +42,7 @@ sprite: Clothing/Neck/mantles/cmomantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleHOP name: head of personnel's mantle description: A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. @@ -43,7 +53,7 @@ sprite: Clothing/Neck/mantles/hopmantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleHOS name: head of security's mantle description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. @@ -54,7 +64,7 @@ sprite: Clothing/Neck/mantles/hosmantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleRD name: research director's mantle description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy. @@ -65,7 +75,7 @@ sprite: Clothing/Neck/mantles/rdmantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleQM name: quartermaster's mantle description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority! @@ -76,7 +86,7 @@ sprite: Clothing/Neck/mantles/qmmantle.rsi - type: entity - parent: ClothingNeckBase + parent: ClothingNeckMantleBase id: ClothingNeckMantleInspector name: inspector's mantle description: Dark mantle that highlights your intimidating figure. These are the shoulders! diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 9e361d5919..cce328a109 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -1,5 +1,15 @@ - type: entity parent: ClothingNeckBase + id: ClothingNeckTieBase + abstract: true + name: red-tie + description: A neosilk clip-on red tie. + components: + - type: Item + storedRotation: 135 + +- type: entity + parent: ClothingNeckTieBase id: ClothingNeckTieRed name: red-tie description: A neosilk clip-on red tie. @@ -15,7 +25,7 @@ - ClothMade - type: entity - parent: ClothingNeckBase + parent: ClothingNeckTieBase id: ClothingNeckTieDet name: detective's tie description: A loosely tied necktie, a perfect accessory for the over-worked detective. @@ -24,9 +34,9 @@ sprite: Clothing/Neck/Ties/dettie.rsi - type: Clothing sprite: Clothing/Neck/Ties/dettie.rsi - + - type: entity - parent: ClothingNeckBase + parent: ClothingNeckTieBase id: ClothingNeckTieSci name: scientist's tie description: Why do we all have to wear these ridiculous ties? diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 2599f28127..adcdcd8fff 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest - type: entity - parent: ClothingOuterBaseMedium + parent: ClothingOuterBase id: ClothingOuterArmorBasic name: armor vest description: A standard Type I armored vest that provides decent protection against most types of damage. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index db00905ea6..1661727cb2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -74,6 +74,8 @@ sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi + - type: Item + storedRotation: -90 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index 7605ca415e..868e391868 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -10,6 +10,7 @@ state: icon - type: Item size: Small + storedRotation: 90 - type: Food requiresSpecialDigestion: true - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml index b7fb1188cc..a38a5dc6c9 100644 --- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml +++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml @@ -40,3 +40,5 @@ - behavior: Anchoring useSound: /Audio/Items/drill_use.ogg changeSound: /Audio/Items/change_drill.ogg + - type: Item + storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index 9b9b145952..a49dfa7386 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -39,6 +39,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - Electrocution - type: Pullable - type: Tag diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 7f6114e364..f183f85e6a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -56,6 +56,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - Electrocution - type: NameIdentifier group: GenericNumber diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index ae5efa75e1..f676d43c2f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -21,6 +21,7 @@ allowed: - SlowedDown - Stutter + - BloodLoss - Electrocution - ForcedSleep - TemporaryBlindness @@ -97,6 +98,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - Electrocution - ForcedSleep - TemporaryBlindness diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml index 9c7974367b..1b3918f2ff 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml @@ -32,6 +32,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - Electrocution - Drunk - SlurredSpeech diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index f18f3b8093..fca92085e1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -132,6 +132,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - SeeingRainbows - Electrocution - Drunk @@ -290,6 +291,7 @@ - KnockedDown - SlowedDown - Stutter + - BloodLoss - SeeingRainbows - Electrocution - ForcedSleep diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3f0277e1bc..a43667dc37 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -440,6 +440,8 @@ Quantity: 10 - ReagentId: Oculine Quantity: 2 + - type: Item + storedRotation: -45 - type: entity name: cabbage @@ -872,6 +874,8 @@ - type: Tag tags: - Fruit + - type: Item + size: Tiny - type: entity name: cocoa pod diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml index f18d7c4ba5..220faf2c99 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml @@ -17,7 +17,7 @@ sprite: Objects/Devices/timer.rsi state: timer - type: Item - size: Small + size: Tiny - type: PayloadTrigger components: - type: OnUseTimerTrigger diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml index 7436ae7c98..228175f8d1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml @@ -9,6 +9,7 @@ state: forensicnew - type: Item size: Small + storedRotation: 90 - type: Clothing sprite: Objects/Devices/forensic_scanner.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml index 160f0c58e7..1f89f8893c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml @@ -18,6 +18,8 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Item + size: Tiny - type: entity name: explosive payload diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index f5e46bbf54..29d6d67885 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -22,6 +22,7 @@ state: pinpointer - type: Item sprite: Objects/Devices/pinpointer.rsi + size: Tiny - type: Pinpointer - type: Appearance - type: GenericVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 9346a47fc5..1bc4e1b0d7 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -9,7 +9,7 @@ sprite: Objects/Materials/Sheets/glass.rsi - type: Item sprite: Objects/Materials/Sheets/glass.rsi - size: Small + size: Normal - type: StaticPrice price: 0 - type: Tag @@ -197,7 +197,7 @@ - ReagentId: Carbon Quantity: 0.5 canReact: false - + - type: entity parent: SheetGlassBase id: SheetPGlass diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index b91f5e153d..3a7b35f1cf 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -8,7 +8,7 @@ sprite: Objects/Materials/Sheets/metal.rsi - type: Item sprite: Objects/Materials/Sheets/metal.rsi - size: Small + size: Normal - type: StaticPrice price: 0 - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 058adc9f16..18590e98df 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -8,7 +8,7 @@ sprite: Objects/Materials/Sheets/other.rsi - type: Item sprite: Objects/Materials/Sheets/other.rsi - size: Small + size: Normal - type: Tag tags: - Sheet diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index 6a93f02c0f..fdcd8455bf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -21,6 +21,8 @@ - type: Sprite sprite: Objects/Misc/nukedisk.rsi state: icon + - type: Item + size: Tiny - type: StaticPrice price: 2000 - type: CargoSellBlacklist diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index edd19c5543..d6ad3575e8 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -4,7 +4,7 @@ parent: BaseItem components: - type: Item - storedRotation: -90 + size: Tiny - type: Battery pricePerJoule: 0.15 - type: PowerCell @@ -291,7 +291,7 @@ parent: BasePowerCell components: - type: Item - size: Ginormous + size: Huge - type: MultiHandedItem - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml index a4692db9b5..44b56fefb1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml @@ -13,7 +13,9 @@ slots: - belt - type: Item - size: Ginormous + size: Large + shape: + - 0, 0, 2, 1 - type: Storage maxItemSize: Normal # allow up to 5 large beakers / 10 beakers / 10 pill canisters grid: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index bc03308d14..cdd34e185a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -19,6 +19,7 @@ Slash: 10 - type: Item sprite: Objects/Tools/Hydroponics/hoe.rsi + storedRotation: 45 - type: entity name: plant clippers @@ -108,6 +109,7 @@ Piercing: 5 # I guess you can stab it into them? - type: Item sprite: Objects/Tools/Hydroponics/spade.rsi + storedRotation: 135 - type: Shovel speedModifier: 0.75 # slower at digging than a full-sized shovel @@ -121,7 +123,7 @@ sprite: Objects/Specific/Hydroponics/Equipment/plant_bag.rsi state: icon - type: Item - storedRotation: -90 + size: Normal - type: Clothing quickEquip: false slots: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index a10bc5b576..706575f691 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -23,6 +23,9 @@ - type: Item size: Large sprite: Objects/Specific/Janitorial/mop.rsi + storedRotation: -135 + shape: + - 0, 0, 3, 0 - type: Absorbent - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index c14c3e8ef0..b2f34ea082 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -27,6 +27,7 @@ state: ointment - type: Item heldPrefix: ointment + storedRotation: 45 - type: Healing damageContainers: - Biological @@ -229,7 +230,7 @@ components: - type: Stack lingering: true - + - type: entity parent: BaseHealingItem id: Tourniquet @@ -268,6 +269,8 @@ - Gauze - type: Sprite state: gauze + - type: Item + storedRotation: 90 - type: Construction graph: Gauze node: gauze diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 43cfde2a98..928f23a541 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -328,6 +328,9 @@ layers: - state: stimpen map: ["enum.SolutionContainerLayers.Fill"] + - type: Item + size: Small + storedRotation: 90 - type: SolutionContainerManager solutions: pen: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index d7f2231ec9..67533bdf11 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -10,9 +10,9 @@ - type: Storage maxItemSize: Small grid: - - 0,0,3,1 + - 0,0,4,1 - type: Item - size: Large + size: Normal sprite: Objects/Specific/Medical/firstaidkits.rsi heldPrefix: firstaid - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 432eda8164..ff12975c6c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -4,6 +4,10 @@ name: research point disk (1000) description: A disk for the R&D server containing 1000 points. components: + - type: Item + size: Small + shape: + - 0, 0, 1, 1 - type: Sprite sprite: Objects/Specific/Research/researchdisk.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index f2f317b654..4d50c7389c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -154,6 +154,8 @@ description: Used to contain a moderate amount of chemicals and solutions. id: Beaker components: + - type: Item + size: Tiny - type: Spillable solution: beaker - type: StaticPrice @@ -281,6 +283,7 @@ - type: Item size: Tiny sprite: Objects/Specific/Chemistry/dropper.rsi + storedRotation: -45 - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 1 @@ -329,8 +332,9 @@ sprite: Objects/Specific/Chemistry/syringe.rsi state: "syringe_base0" - type: Item - size: Tiny + size: Small sprite: Objects/Specific/Chemistry/syringe.rsi + storedRotation: -45 - type: SolutionContainerManager solutions: injector: diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index f2c236064a..0334cf30c8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -64,6 +64,7 @@ - type: Item sprite: Objects/Devices/communication.rsi heldPrefix: old-radio + storedRotation: 90 - type: UserInterface interfaces: - key: enum.StoreUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 019742ee04..4ea677965e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -9,6 +9,7 @@ - type: Item size: Normal sprite: Objects/Tanks/generic.rsi + storedRotation: 45 - type: Clothing quickEquip: false sprite: Objects/Tanks/generic.rsi @@ -57,6 +58,8 @@ sprite: Objects/Tanks/oxygen.rsi - type: Item sprite: Objects/Tanks/oxygen.rsi + shape: + - 0, 0, 3, 0 - type: GasTank outputPressure: 21.3 air: @@ -87,6 +90,8 @@ sprite: Objects/Tanks/emergency.rsi - type: Item size: Small + shape: + - 0, 0, 1, 0 sprite: Objects/Tanks/emergency.rsi - type: GasTank air: @@ -208,6 +213,9 @@ air: volume: 15 temperature: 293.15 + - type: Item + shape: + - 0, 0, 3, 0 - type: entity parent: GasTankRoundBase @@ -219,6 +227,8 @@ sprite: Objects/Tanks/anesthetic.rsi - type: Item sprite: Objects/Tanks/anesthetic.rsi + shape: + - 0, 0, 3, 0 - type: GasTank outputPressure: 30.4 air: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 5e6de0aebf..142eb9b695 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -38,6 +38,8 @@ - type: Item sprite: Objects/Tanks/Jetpacks/blue.rsi size: Huge + shape: + - 0, 0, 2, 3 - type: UserInterface interfaces: - key: enum.SharedGasTankUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml index 903b8d3f90..1031cac5ef 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml @@ -9,6 +9,7 @@ state: spray_painter - type: Item sprite: Objects/Tools/spray_painter.rsi + storedRotation: -90 - type: ActivatableUI key: enum.SprayPainterUiKey.Key - type: UserInterface diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 374f00b402..800c0add54 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -23,7 +23,9 @@ grid: - 0,0,6,3 - type: Item - size: Ginormous + size: Large + shape: + - 0,0,6,2 - type: MeleeWeapon damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 4f87305bf9..1109aadae2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -502,6 +502,7 @@ sprite: Objects/Tools/rcd.rsi state: ammo - type: Item + size: Tiny sprite: Objects/Tools/rcd.rsi heldPrefix: ammo - type: PhysicalComposition 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 3347b580e1..a165383838 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -12,6 +12,8 @@ - type: Sprite - type: Item size: Huge + shape: + - 0,0,4,1 - type: Clothing sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi quickEquip: false @@ -838,3 +840,5 @@ price: 800 - type: Item size: Large + shape: + - 0, 0, 3, 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 80475c2b4a..1ea5c35eae 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -13,6 +13,8 @@ - Back - type: Item size: Huge + shape: + - 0,0,5,1 - type: StaticPrice price: 500 - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index ce6cb07e13..d8cdb8e0d9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -8,6 +8,8 @@ - type: Sprite - type: Item size: Huge + shape: + - 0,0,4,1 - type: Clothing sprite: Objects/Weapons/Guns/Rifles/ak.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index a25e75420b..e5764f1946 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -11,6 +11,8 @@ map: ["enum.GunVisualLayers.Base"] - type: Item size: Huge + shape: + - 0,0,4,0 - type: Clothing sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 6827f3a3e8..5915cb24b5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -41,6 +41,7 @@ state: icon - type: Item sprite: Objects/Weapons/Melee/kitchen_knife.rsi + storedRotation: -45 - type: GuideHelp guides: - Chef @@ -102,6 +103,7 @@ Slash: 10 - type: Item sprite: Objects/Weapons/Melee/combat_knife.rsi + storedRotation: -45 - type: DisarmMalus malus: 0.225 - type: Construction @@ -291,3 +293,4 @@ Piercing: 15 - type: Item sprite: Objects/Weapons/Melee/throwing_knife.rsi + storedRotation: -45 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 0579964727..d982243dfe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -48,7 +48,10 @@ types: Piercing: 15 - type: Item - size: Ginormous + storedRotation: 44 # It just works + size: Huge + shape: + - 0,0,5,0 - type: Clothing quickEquip: false slots: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 0745425e9d..46ba8b7b20 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -24,6 +24,9 @@ - type: Item size: Large sprite: Objects/Weapons/Melee/captain_sabre.rsi + storedRotation: 44 # It just works + shape: + - 0, 0, 4, 0 - type: Tag tags: - CaptainSabre diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index cdc6ef0a2f..0c547cae22 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -52,6 +52,9 @@ - type: Item heldPrefix: off size: Normal + shape: + - 0,0,2,0 + storedRotation: 44 - type: Clothing sprite: Objects/Weapons/Melee/stunbaton.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Virtual/virtual_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_item.yml index ed74243550..5fc2ff90ee 100644 --- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml +++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml @@ -5,4 +5,5 @@ noSpawn: true components: - type: Item + size: Ginormous - type: VirtualItem diff --git a/Resources/Prototypes/Entities/White/voice_recorder.yml b/Resources/Prototypes/Entities/White/voice_recorder.yml index a7a49fb186..a2fbe5659d 100644 --- a/Resources/Prototypes/Entities/White/voice_recorder.yml +++ b/Resources/Prototypes/Entities/White/voice_recorder.yml @@ -17,6 +17,7 @@ - type: Item heldPrefix: off sprite: White/VoiceRecorder/voicerecorder.rsi + storedRotation: 90 - type: Appearance - type: VoiceRecorder blacklist: diff --git a/Resources/Prototypes/_White/Economy/card.yml b/Resources/Prototypes/_White/Economy/card.yml index bc836bde9f..bec8e1c851 100644 --- a/Resources/Prototypes/_White/Economy/card.yml +++ b/Resources/Prototypes/_White/Economy/card.yml @@ -9,6 +9,8 @@ sprite: White/Misc/cards.rsi scale: 0.8, 0.8 state: budgetcard + - type: Item + storedRotation: 90 - type: entity parent: BaseDepartmentBudgetCard diff --git a/Resources/Prototypes/item_size.yml b/Resources/Prototypes/item_size.yml index f02a7e9fd6..ebdfbced1d 100644 --- a/Resources/Prototypes/item_size.yml +++ b/Resources/Prototypes/item_size.yml @@ -45,3 +45,5 @@ name: item-component-size-Ginormous defaultShape: - 0,0,5,5 + + diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml index a9ea56db57..563a4df5a8 100644 --- a/Resources/Prototypes/status_effects.yml +++ b/Resources/Prototypes/status_effects.yml @@ -68,6 +68,9 @@ id: NarcoticEffect alwaysAllowed: true -#WD EDIT +# WD EDIT - type: statusEffect id: Incorporeal + +- type: statusEffect + id: BloodLoss From 804ea205d6cd1c4b60883c063a84d9244782ee70 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Thu, 27 Jun 2024 21:29:16 +0300 Subject: [PATCH 08/11] Eshe fixes (#388) * fix: antags must be alive * fix: fix flare gun * fix: fix rd suit size * remove govnovoz --- Content.Server/Audio/ContentAudioSystem.cs | 2 +- Content.Server/Ghost/GhostSystem.cs | 14 ++++-- .../Clothing/OuterClothing/hardsuits.yml | 2 +- .../Objects/Weapons/Guns/flare_gun.yml | 12 +++++ .../Prototypes/SoundCollections/lobby.yml | 46 +++++++++++-------- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs index f36d14cbaf..e2be27f16b 100644 --- a/Content.Server/Audio/ContentAudioSystem.cs +++ b/Content.Server/Audio/ContentAudioSystem.cs @@ -14,7 +14,7 @@ namespace Content.Server.Audio; public sealed class ContentAudioSystem : SharedContentAudioSystem { [ValidatePrototypeId] - private const string LobbyMusicCollection = "LobbyMusic"; + private const string LobbyMusicCollection = "LobbyMusicWhite"; [Dependency] private readonly AudioSystem _serverAudio = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index a6baee636c..fe81f86a78 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -38,6 +38,7 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; using Robust.Shared.Player; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager.Exceptions; using Robust.Shared.Timing; using InvisibilityComponent = Content.Shared._White.Administration.InvisibilityComponent; @@ -455,8 +456,10 @@ namespace Content.Server.Ghost { var entity = mindContainer.Owner; - if (!(HasComp(entity) || HasComp(entity)) || - HasComp(entity)) + if (!(HasComp(entity) || HasComp(entity))) + continue; + + if (HasComp(entity)) continue; var playerDepartmentId = _prototypeManager.Index("Specific").ID; @@ -503,9 +506,12 @@ namespace Content.Server.Ghost foreach (var antagonist in EntityQuery()) { var entity = antagonist.Owner; + + if (!_mobState.IsAlive(entity)) + continue; + var prototype = - _prototypeManager.Index(antagonist.AntagonistPrototype ?? - "globalAntagonistUnknown"); + _prototypeManager.Index(antagonist.AntagonistPrototype ?? "globalAntagonistUnknown"); var warp = new GhostWarpGlobalAntagonist( GetNetEntity(entity), diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 918406652a..c59503aa7e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -421,7 +421,7 @@ sprintModifier: 0.8 - type: HeldSpeedModifier - type: Item - size: Normal + size: Huge - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index 9b046a7aae..dda12ec28e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -12,6 +12,9 @@ - type: Item size: Small sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi + shape: + - 0,0,1,0 + - 0,1,0,1 - type: Gun fireRate: 8 selectedMode: SemiAuto @@ -37,3 +40,12 @@ slots: - Belt - suitStorage + - type: EmitSoundOnPickup + sound: + collection: PistolsPickUp + - type: EmitSoundOnDrop + sound: + collection: PistolsDrop + - type: EmitSoundOnLand + sound: + collection: PistolsDrop diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 19892aade0..287783fc93 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -1,28 +1,38 @@ +# Хз куда это +#- /Audio/Lobby/itachi.ogg +#- /Audio/Lobby/bobby.ogg + - type: soundCollection - id: LobbyMusic + id: LobbyMusicMeme + files: + - /Audio/Lobby/govnovoz.ogg + - /Audio/Lobby/govnovoz2.ogg + - /Audio/Lobby/govnovoz3.ogg + - /Audio/Lobby/govnovoz4.ogg + +- type: soundCollection + id: LobbyMusicSongs + files: + - /Audio/Lobby/spaceoddity.ogg + - /Audio/Lobby/space_asshole.ogg + +- type: soundCollection + id: LobbyMusicWhite files: - /Audio/Lobby/thunderdome.ogg - /Audio/Lobby/singuloose.ogg - - /Audio/Lobby/title2.ogg - - /Audio/Lobby/title3.ogg - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - /Audio/Lobby/atomicamnesiammx.ogg - - /Audio/Lobby/itachi.ogg - - /Audio/Lobby/govnovoz.ogg - - /Audio/Lobby/govnovoz2.ogg - - /Audio/Lobby/govnovoz3.ogg - - /Audio/Lobby/govnovoz4.ogg - - /Audio/Lobby/spaceoddity.ogg - # - /Audio/Lobby/absconditus.ogg - # - /Audio/Lobby/space_asshole.ogg - # - /Audio/Lobby/endless_space.ogg - # - /Audio/Lobby/comet_haley.ogg - # - /Audio/Lobby/mod.flip-flap.ogg - # - /Audio/Lobby/Spac_Stac.ogg - # - /Audio/Lobby/pwmur.ogg + - /Audio/Lobby/Spac_Stac.ogg + - /Audio/Lobby/comet_haley.ogg - type: soundCollection - id: LobbyMusicOld + id: LobbyMusicSS13 files: - - /Audio/Lobby/bobby.ogg + - /Audio/Lobby/title2.ogg + - /Audio/Lobby/title3.ogg + - /Audio/Lobby/absconditus.ogg + - /Audio/Lobby/endless_space.ogg + - /Audio/Lobby/mod.flip-flap.ogg + - /Audio/Lobby/pwmur.ogg From d994a0fbb45c2c0d9e7c6c8b756ac5b602e095c6 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Thu, 27 Jun 2024 18:30:20 +0000 Subject: [PATCH 09/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 7f0118f54c..633af092a7 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -4989,3 +4989,25 @@ id: 328 time: '2024-06-27T05:59:13.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/374 +- author: ThereDrD + changes: + - message: "\u0412 \u043F\u0430\u043D\u0435\u043B\u0438 \u0433\u043E\u0441\u0442\ + \u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043E\u0442\u043E\ + \u0431\u0440\u0430\u0436\u0430\u044E\u0442\u0441\u044F \u043C\u0435\u0440\u0442\ + \u0432\u044B\u0435 \u0430\u043D\u0442\u0430\u0433\u043E\u043D\u0438\u0441\u0442\ + \u044B" + type: Fix + - message: "\u0424\u0438\u043A\u0441 \u0440\u0430\u0437\u043C\u0435\u0440\u0430\ + \ \u0444\u043B\u0435\u0435\u0440\u0433\u0430\u043D\u0430" + type: Fix + - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440 \u0420\u0414 \u0431\ + \u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u043C\u0435\u0449\u0430\ + \u0435\u0442\u0441\u044F \u0432 \u043F\u043E\u044F\u0441" + type: Fix + - message: "\u0413\u043E\u0432\u043D\u043E\u0432\u043E\u0437 \u043F\u0440\u043E\u043F\ + \u0430\u043B \u0438\u0437 \u043B\u043E\u0431\u0431\u0438, \u0432\u0440\u0435\ + \u043C\u0435\u043D\u043D\u043E." + type: Remove + id: 329 + time: '2024-06-27T18:29:16.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/388 From 36ab40ada789bc8ed6905e7f35b6934be20e315f Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Thu, 27 Jun 2024 23:54:09 +0300 Subject: [PATCH 10/11] =?UTF-8?q?=D0=93=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B9=D1=82=20=D0=BE=D1=80=D1=83=D0=B6=D0=B8=D1=8F=20(#387)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * resprite: part 1 * total brainfucken * fixes * uplink icons + ammunition resprite --- .../Prototypes/Catalog/uplink_catalog.yml | 11 ++-- .../Guns/Ammunition/Magazines/light_rifle.yml | 6 +-- .../Guns/Ammunition/Magazines/pistol.yml | 6 +-- .../Guns/Ammunition/Magazines/rifle.yml | 2 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 31 ++++++++--- .../Weapons/Guns/Launchers/launchers.yml | 28 ++++++---- .../Objects/Weapons/Guns/Rifles/rifles.yml | 12 +++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 28 ++++++---- .../Weapons/Guns/Shotguns/shotguns.yml | 31 ++++++----- .../Objects/Weapons/Guns/Snipers/snipers.yml | 25 +++++++-- .../Prototypes/_White/Catalog/Cargo/cargo.yml | 10 ++-- .../Prototypes/_White/Catalog/uplink.yml | 3 +- .../LightRifle/light_rifle_box.rsi/base.png | Bin 0 -> 284 bytes .../LightRifle/light_rifle_box.rsi/mag-1.png | Bin 0 -> 320 bytes .../LightRifle/light_rifle_box.rsi/mag-2.png | Bin 0 -> 288 bytes .../LightRifle/light_rifle_box.rsi/mag-3.png | Bin 0 -> 322 bytes .../LightRifle/light_rifle_box.rsi/mag-4.png | Bin 0 -> 332 bytes .../LightRifle/light_rifle_box.rsi/mag-5.png | Bin 0 -> 348 bytes .../LightRifle/light_rifle_box.rsi/meta.json | 29 ++++++++++ .../LightRifle/light_rifle_mag.rsi/base.png | Bin 0 -> 360 bytes .../LightRifle/light_rifle_mag.rsi/mag-1.png | Bin 0 -> 198 bytes .../LightRifle/light_rifle_mag.rsi/meta.json | 29 ++++++++++ .../light_rifle_mag.rsi/practice.png | Bin 0 -> 419 bytes .../LightRifle/light_rifle_mag.rsi/red.png | Bin 0 -> 423 bytes .../LightRifle/light_rifle_mag.rsi/rubber.png | Bin 0 -> 410 bytes .../light_rifle_mag.rsi/uranium.png | Bin 0 -> 413 bytes .../Magazine/Pistol/smg_mag.rsi/base.png | Bin 0 -> 334 bytes .../Magazine/Pistol/smg_mag.rsi/mag-1.png | Bin 0 -> 188 bytes .../Magazine/Pistol/smg_mag.rsi/mag-2.png | Bin 0 -> 222 bytes .../Magazine/Pistol/smg_mag.rsi/mag-3.png | Bin 0 -> 247 bytes .../Magazine/Pistol/smg_mag.rsi/mag-4.png | Bin 0 -> 251 bytes .../Magazine/Pistol/smg_mag.rsi/mag-5.png | Bin 0 -> 282 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 44 +++++++++++++++ .../Magazine/Pistol/smg_mag.rsi/practice.png | Bin 0 -> 392 bytes .../Magazine/Pistol/smg_mag.rsi/red-icon.png | Bin 0 -> 436 bytes .../Magazine/Pistol/smg_mag.rsi/red.png | Bin 0 -> 392 bytes .../Magazine/Pistol/smg_mag.rsi/rubber.png | Bin 0 -> 391 bytes .../Magazine/Pistol/smg_mag.rsi/uranium.png | Bin 0 -> 386 bytes .../Pistol/smg_mag_top_mounted.rsi/base.png | Bin 0 -> 286 bytes .../mag-unshaded-1.png | Bin 0 -> 145 bytes .../mag-unshaded-2.png | Bin 0 -> 162 bytes .../mag-unshaded-3.png | Bin 0 -> 160 bytes .../mag-unshaded-4.png | Bin 0 -> 168 bytes .../Pistol/smg_mag_top_mounted.rsi/meta.json | 26 +++++++++ .../Magazine/Rifle/rifle_mag.rsi/base.png | Bin 0 -> 370 bytes .../Magazine/Rifle/rifle_mag.rsi/mag-1.png | Bin 0 -> 202 bytes .../Magazine/Rifle/rifle_mag.rsi/meta.json | 29 ++++++++++ .../Magazine/Rifle/rifle_mag.rsi/practice.png | Bin 0 -> 431 bytes .../Magazine/Rifle/rifle_mag.rsi/red.png | Bin 0 -> 429 bytes .../Magazine/Rifle/rifle_mag.rsi/rubber.png | Bin 0 -> 427 bytes .../Magazine/Rifle/rifle_mag.rsi/uranium.png | Bin 0 -> 431 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/base.png | Bin 0 -> 563 bytes .../Guns/LMGs/l6-icons.rsi/bolt-open.png | Bin 0 -> 593 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/icon.png | Bin 0 -> 683 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/mag-0.png | Bin 0 -> 354 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/mag-1.png | Bin 0 -> 352 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/mag-2.png | Bin 0 -> 332 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/mag-3.png | Bin 0 -> 352 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/mag-4.png | Bin 0 -> 354 bytes .../Weapons/Guns/LMGs/l6-icons.rsi/meta.json | 35 ++++++++++++ .../LMGs/l6-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1494 bytes .../Guns/LMGs/l6-inhands.rsi/inhand-left.png | Bin 0 -> 1060 bytes .../Guns/LMGs/l6-inhands.rsi/inhand-right.png | Bin 0 -> 1244 bytes .../Guns/LMGs/l6-inhands.rsi/meta.json | 31 +++++++++++ .../l6-inhands.rsi/wielded-inhand-left.png | Bin 0 -> 1300 bytes .../l6-inhands.rsi/wielded-inhand-right.png | Bin 0 -> 1411 bytes .../china_lake-icons.rsi/bolt-open.png | Bin 0 -> 578 bytes .../Launchers/china_lake-icons.rsi/icon.png | Bin 0 -> 577 bytes .../Launchers/china_lake-icons.rsi/meta.json | 17 ++++++ .../equipped-BACKPACK.png | Bin 0 -> 1786 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1786 bytes .../china_lake-inhands.rsi/inhand-left.png | Bin 0 -> 1031 bytes .../china_lake-inhands.rsi/inhand-right.png | Bin 0 -> 1381 bytes .../china_lake-inhands.rsi/meta.json | 27 ++++++++++ .../Guns/Launchers/rocket-icons.rsi/base.png | Bin 0 -> 822 bytes .../Guns/Launchers/rocket-icons.rsi/icon.png | Bin 0 -> 881 bytes .../Guns/Launchers/rocket-icons.rsi/mag-0.png | Bin 0 -> 255 bytes .../Guns/Launchers/rocket-icons.rsi/mag-1.png | Bin 0 -> 255 bytes .../Guns/Launchers/rocket-icons.rsi/meta.json | 23 ++++++++ .../rocket-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1386 bytes .../rocket-inhands.rsi/inhand-left.png | Bin 0 -> 1584 bytes .../rocket-inhands.rsi/inhand-right.png | Bin 0 -> 1949 bytes .../Launchers/rocket-inhands.rsi/meta.json | 31 +++++++++++ .../rocket0-inhand-left.png | Bin 0 -> 1444 bytes .../rocket0-inhand-right.png | Bin 0 -> 2074 bytes .../Guns/Rifles/ak-icons.rsi/accelerator.png | Bin 0 -> 249 bytes .../Weapons/Guns/Rifles/ak-icons.rsi/base.png | Bin 0 -> 619 bytes .../Guns/Rifles/ak-icons.rsi/bolt-open.png | Bin 0 -> 620 bytes .../Guns/Rifles/ak-icons.rsi/flamehider.png | Bin 0 -> 171 bytes .../Weapons/Guns/Rifles/ak-icons.rsi/icon.png | Bin 0 -> 729 bytes .../Guns/Rifles/ak-icons.rsi/laser.png | Bin 0 -> 256 bytes .../Guns/Rifles/ak-icons.rsi/light.png | Bin 0 -> 220 bytes .../Guns/Rifles/ak-icons.rsi/mag-0.png | Bin 0 -> 260 bytes .../Guns/Rifles/ak-icons.rsi/meta.json | 23 ++++++++ .../Guns/Rifles/ak-icons.rsi/silencer.png | Bin 0 -> 202 bytes .../ak-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1376 bytes .../ak-inhands.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1376 bytes .../Rifles/ak-inhands.rsi/inhand-left.png | Bin 0 -> 981 bytes .../Rifles/ak-inhands.rsi/inhand-right.png | Bin 0 -> 969 bytes .../Guns/Rifles/ak-inhands.rsi/meta.json | 27 ++++++++++ .../Rifles/lecter-icons.rsi/accelerator.png | Bin 0 -> 207 bytes .../Guns/Rifles/lecter-icons.rsi/base.png | Bin 0 -> 719 bytes .../Rifles/lecter-icons.rsi/bolt-open.png | Bin 0 -> 703 bytes .../Rifles/lecter-icons.rsi/flamehider.png | Bin 0 -> 171 bytes .../Rifles/lecter-icons.rsi/handguard.png | Bin 0 -> 232 bytes .../Guns/Rifles/lecter-icons.rsi/icon.png | Bin 0 -> 772 bytes .../Guns/Rifles/lecter-icons.rsi/laser.png | Bin 0 -> 255 bytes .../Guns/Rifles/lecter-icons.rsi/light.png | Bin 0 -> 238 bytes .../Guns/Rifles/lecter-icons.rsi/mag-0.png | Bin 0 -> 255 bytes .../Guns/Rifles/lecter-icons.rsi/meta.json | 23 ++++++++ .../Guns/Rifles/lecter-icons.rsi/silencer.png | Bin 0 -> 193 bytes .../lecter-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1433 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1433 bytes .../Rifles/lecter-inhands.rsi/inhand-left.png | Bin 0 -> 1207 bytes .../lecter-inhands.rsi/inhand-right.png | Bin 0 -> 1048 bytes .../Guns/Rifles/lecter-inhands.rsi/meta.json | 27 ++++++++++ .../SMG/atreides-icons.rsi/accelerator.png | Bin 0 -> 220 bytes .../Guns/SMG/atreides-icons.rsi/base.png | Bin 0 -> 498 bytes .../Guns/SMG/atreides-icons.rsi/bolt-open.png | Bin 0 -> 493 bytes .../SMG/atreides-icons.rsi/flamehider.png | Bin 0 -> 186 bytes .../Guns/SMG/atreides-icons.rsi/icon.png | Bin 0 -> 532 bytes .../Guns/SMG/atreides-icons.rsi/laser.png | Bin 0 -> 258 bytes .../Guns/SMG/atreides-icons.rsi/light.png | Bin 0 -> 232 bytes .../Guns/SMG/atreides-icons.rsi/mag-0.png | Bin 0 -> 215 bytes .../Guns/SMG/atreides-icons.rsi/meta.json | 26 +++++++++ .../Guns/SMG/atreides-icons.rsi/silencer.png | Bin 0 -> 209 bytes .../equipped-BACKPACK.png | Bin 0 -> 965 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 965 bytes .../SMG/atreides-inhands.rsi/inhand-left.png | Bin 0 -> 791 bytes .../SMG/atreides-inhands.rsi/inhand-right.png | Bin 0 -> 749 bytes .../Guns/SMG/atreides-inhands.rsi/meta.json | 27 ++++++++++ .../Guns/SMG/c20r-icons.rsi/accelerator.png | Bin 0 -> 192 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/base.png | Bin 0 -> 562 bytes .../Guns/SMG/c20r-icons.rsi/bolt-open.png | Bin 0 -> 552 bytes .../Guns/SMG/c20r-icons.rsi/flamehider.png | Bin 0 -> 192 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/icon.png | Bin 0 -> 715 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/laser.png | Bin 0 -> 249 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/light.png | Bin 0 -> 212 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/mag-0.png | Bin 0 -> 288 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/mag-1.png | Bin 0 -> 290 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/mag-2.png | Bin 0 -> 290 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/mag-3.png | Bin 0 -> 288 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/meta.json | 35 ++++++++++++ .../Guns/SMG/c20r-icons.rsi/silencer.png | Bin 0 -> 207 bytes .../c20r-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1074 bytes .../c20r-inhands.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1074 bytes .../Guns/SMG/c20r-inhands.rsi/inhand-left.png | Bin 0 -> 850 bytes .../SMG/c20r-inhands.rsi/inhand-right.png | Bin 0 -> 1147 bytes .../Guns/SMG/c20r-inhands.rsi/meta.json | 27 ++++++++++ .../Guns/SMG/drozd-icons.rsi/accelerator.png | Bin 0 -> 240 bytes .../Weapons/Guns/SMG/drozd-icons.rsi/base.png | Bin 0 -> 712 bytes .../Guns/SMG/drozd-icons.rsi/bolt-open.png | Bin 0 -> 717 bytes .../Guns/SMG/drozd-icons.rsi/flamehider.png | Bin 0 -> 179 bytes .../Guns/SMG/drozd-icons.rsi/handguard.png | Bin 0 -> 232 bytes .../Weapons/Guns/SMG/drozd-icons.rsi/icon.png | Bin 0 -> 712 bytes .../Guns/SMG/drozd-icons.rsi/laser.png | Bin 0 -> 253 bytes .../Guns/SMG/drozd-icons.rsi/light.png | Bin 0 -> 240 bytes .../Guns/SMG/drozd-icons.rsi/mag-0.png | Bin 0 -> 231 bytes .../Guns/SMG/drozd-icons.rsi/meta.json | 26 +++++++++ .../Guns/SMG/drozd-icons.rsi/silencer.png | Bin 0 -> 207 bytes .../drozd-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1855 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1855 bytes .../SMG/drozd-inhands.rsi/inhand-left.png | Bin 0 -> 830 bytes .../SMG/drozd-inhands.rsi/inhand-right.png | Bin 0 -> 713 bytes .../Guns/SMG/drozd-inhands.rsi/meta.json | 27 ++++++++++ .../Guns/SMG/wt550-icons.rsi/accelerator.png | Bin 0 -> 197 bytes .../SMG/wt550-icons.rsi/base-unshaded.png | Bin 0 -> 161 bytes .../Weapons/Guns/SMG/wt550-icons.rsi/base.png | Bin 0 -> 626 bytes .../Guns/SMG/wt550-icons.rsi/flamehider.png | Bin 0 -> 176 bytes .../Weapons/Guns/SMG/wt550-icons.rsi/icon.png | Bin 0 -> 683 bytes .../Guns/SMG/wt550-icons.rsi/laser.png | Bin 0 -> 258 bytes .../Guns/SMG/wt550-icons.rsi/light.png | Bin 0 -> 226 bytes .../Guns/SMG/wt550-icons.rsi/mag-0.png | Bin 0 -> 197 bytes .../Guns/SMG/wt550-icons.rsi/mag-1.png | Bin 0 -> 202 bytes .../Guns/SMG/wt550-icons.rsi/mag-2.png | Bin 0 -> 202 bytes .../Guns/SMG/wt550-icons.rsi/mag-3.png | Bin 0 -> 197 bytes .../Guns/SMG/wt550-icons.rsi/mag-4.png | Bin 0 -> 165 bytes .../SMG/wt550-icons.rsi/mag-unshaded-0.png | Bin 0 -> 161 bytes .../SMG/wt550-icons.rsi/mag-unshaded-1.png | Bin 0 -> 173 bytes .../SMG/wt550-icons.rsi/mag-unshaded-2.png | Bin 0 -> 193 bytes .../SMG/wt550-icons.rsi/mag-unshaded-3.png | Bin 0 -> 197 bytes .../SMG/wt550-icons.rsi/mag-unshaded-4.png | Bin 0 -> 210 bytes .../Guns/SMG/wt550-icons.rsi/meta.json | 50 +++++++++++++++++ .../Guns/SMG/wt550-icons.rsi/silencer.png | Bin 0 -> 210 bytes .../wt550-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1198 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1198 bytes .../SMG/wt550-inhands.rsi/inhand-left.png | Bin 0 -> 713 bytes .../SMG/wt550-inhands.rsi/inhand-right.png | Bin 0 -> 968 bytes .../Guns/SMG/wt550-inhands.rsi/meta.json | 27 ++++++++++ .../Guns/Shotguns/bulldog-icons.rsi/base.png | Bin 0 -> 603 bytes .../Shotguns/bulldog-icons.rsi/bolt-open.png | Bin 0 -> 617 bytes .../Guns/Shotguns/bulldog-icons.rsi/icon.png | Bin 0 -> 687 bytes .../Guns/Shotguns/bulldog-icons.rsi/mag-0.png | Bin 0 -> 328 bytes .../Guns/Shotguns/bulldog-icons.rsi/mag-1.png | Bin 0 -> 310 bytes .../Guns/Shotguns/bulldog-icons.rsi/mag-2.png | Bin 0 -> 310 bytes .../Guns/Shotguns/bulldog-icons.rsi/mag-3.png | Bin 0 -> 328 bytes .../Guns/Shotguns/bulldog-icons.rsi/meta.json | 32 +++++++++++ .../bulldog-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1281 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1281 bytes .../bulldog-inhands.rsi/inhand-left.png | Bin 0 -> 1196 bytes .../bulldog-inhands.rsi/inhand-right.png | Bin 0 -> 2647 bytes .../Shotguns/bulldog-inhands.rsi/meta.json | 27 ++++++++++ .../db_shotgun-icons.rsi/bolt-open.png | Bin 0 -> 637 bytes .../Shotguns/db_shotgun-icons.rsi/icon.png | Bin 0 -> 489 bytes .../Shotguns/db_shotgun-icons.rsi/meta.json | 17 ++++++ .../equipped-BACKPACK.png | Bin 0 -> 1037 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1037 bytes .../db_shotgun-inhands.rsi/inhand-left.png | Bin 0 -> 1117 bytes .../db_shotgun-inhands.rsi/inhand-right.png | Bin 0 -> 1075 bytes .../Shotguns/db_shotgun-inhands.rsi/meta.json | 27 ++++++++++ .../Shotguns/enforcer-icons.rsi/bolt-open.png | Bin 0 -> 626 bytes .../Guns/Shotguns/enforcer-icons.rsi/icon.png | Bin 0 -> 635 bytes .../Shotguns/enforcer-icons.rsi/meta.json | 17 ++++++ .../equipped-BACKPACK.png | Bin 0 -> 1142 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1142 bytes .../enforcer-inhands.rsi/inhand-left.png | Bin 0 -> 1250 bytes .../enforcer-inhands.rsi/inhand-right.png | Bin 0 -> 1475 bytes .../Shotguns/enforcer-inhands.rsi/meta.json | 27 ++++++++++ .../bolt-open.png | Bin 0 -> 706 bytes .../improvised_shotgun-icons.rsi/icon.png | Bin 0 -> 566 bytes .../improvised_shotgun-icons.rsi/meta.json | 17 ++++++ .../equipped-BACKPACK.png | Bin 0 -> 1125 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1125 bytes .../inhand-left.png | Bin 0 -> 2024 bytes .../inhand-right.png | Bin 0 -> 1210 bytes .../improvised_shotgun-inhands.rsi/meta.json | 27 ++++++++++ .../Shotguns/pump-icons.rsi/bolt-open.png | Bin 0 -> 526 bytes .../Guns/Shotguns/pump-icons.rsi/icon.png | Bin 0 -> 527 bytes .../Guns/Shotguns/pump-icons.rsi/meta.json | 17 ++++++ .../pump-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1069 bytes .../pump-inhands.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1069 bytes .../Shotguns/pump-inhands.rsi/inhand-left.png | Bin 0 -> 1274 bytes .../pump-inhands.rsi/inhand-right.png | Bin 0 -> 1403 bytes .../Guns/Shotguns/pump-inhands.rsi/meta.json | 27 ++++++++++ .../bolt_gun_wood-icons.rsi/bolt-open.png | Bin 0 -> 616 bytes .../Snipers/bolt_gun_wood-icons.rsi/icon.png | Bin 0 -> 569 bytes .../Snipers/bolt_gun_wood-icons.rsi/meta.json | 17 ++++++ .../Snipers/bolt_gun_wood-icons.rsi/scope.png | Bin 0 -> 230 bytes .../equipped-BACKPACK.png | Bin 0 -> 1251 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1251 bytes .../bolt_gun_wood-inhands.rsi/inhand-left.png | Bin 0 -> 1689 bytes .../inhand-right.png | Bin 0 -> 1827 bytes .../bolt_gun_wood-inhands.rsi/meta.json | 51 ++++++++++++++++++ .../scope-inhand-left.png | Bin 0 -> 346 bytes .../scope-inhand-right.png | Bin 0 -> 1695 bytes .../scope-wielded-left.png | Bin 0 -> 329 bytes .../scope-wielded-right.png | Bin 0 -> 332 bytes .../wielded-inhand-left.png | Bin 0 -> 1031 bytes .../wielded-inhand-right.png | Bin 0 -> 1265 bytes .../Guns/Snipers/hristov-icons.rsi/base.png | Bin 0 -> 555 bytes .../Snipers/hristov-icons.rsi/bolt-open.png | Bin 0 -> 558 bytes .../Guns/Snipers/hristov-icons.rsi/icon.png | Bin 0 -> 579 bytes .../Guns/Snipers/hristov-icons.rsi/mag-0.png | Bin 0 -> 195 bytes .../Guns/Snipers/hristov-icons.rsi/meta.json | 23 ++++++++ .../hristov-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1485 bytes .../hristov-inhands.rsi/inhand-left.png | Bin 0 -> 1665 bytes .../hristov-inhands.rsi/inhand-right.png | Bin 0 -> 1588 bytes .../Snipers/hristov-inhands.rsi/meta.json | 31 +++++++++++ .../wielded-inhand-left.png | Bin 0 -> 1254 bytes .../wielded-inhand-right.png | Bin 0 -> 1950 bytes 260 files changed, 1150 insertions(+), 66 deletions(-) create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/rocket0-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/rocket0-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/handguard.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/handguard.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/accelerator.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base-unshaded.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/flamehider.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/laser.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/light.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/silencer.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-1.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-2.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-3.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/scope.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-wielded-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-wielded-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d7934b1d6b..0d5fd5d584 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -39,6 +39,7 @@ id: UplinkRifleMosin name: uplink-rifle-mosin-name description: uplink-rifle-mosin-desc + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi, state: icon } productEntity: WeaponSniperMosin cost: Telecrystal: 1 @@ -135,7 +136,7 @@ id: UplinkSniperBundle name: uplink-sniper-bundle-name description: uplink-sniper-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi, state: icon } productEntity: BriefcaseSyndieSniperBundleFilled cost: Telecrystal: 20 # WD EDIT @@ -147,7 +148,7 @@ id: UplinkC20RBundle name: uplink-c20r-bundle-name description: uplink-c20r-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledSMG cost: Telecrystal: 15 # WD EDIT @@ -159,7 +160,7 @@ id: UplinkBulldogBundle name: uplink-buldog-bundle-name description: uplink-buldog-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledShotgun cost: Telecrystal: 17 @@ -171,7 +172,7 @@ id: UplinkGrenadeLauncherBundle name: uplink-grenade-launcher-bundle-name description: uplink-grenade-launcher-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher cost: Telecrystal: 25 @@ -183,7 +184,7 @@ id: UplinkL6SawBundle name: uplink-l6-saw-bundle-name description: uplink-l6-saw-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledLMG cost: Telecrystal: 25 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index d420a5c3d8..e19deae799 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -21,7 +21,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -47,10 +47,10 @@ capacity: 100 - type: Item - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - type: MagazineVisuals magState: mag - steps: 8 + steps: 6 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 679acd299c..33dc6c6b50 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -85,7 +85,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -112,7 +112,7 @@ tags: - CartridgePistol - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -121,7 +121,7 @@ shader: unshaded - type: MagazineVisuals magState: mag - steps: 6 + steps: 5 zeroVisible: false - type: Appearance - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 5ba57dce4e..bd1bf58d47 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -20,7 +20,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 67e738d1b5..a9fd713e4d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -9,7 +9,7 @@ - type: Item size: Huge - type: Clothing - sprite: Objects/Weapons/Guns/LMGs/l6.rsi + sprite: White/Objects/Weapons/Guns/LMGs/l6.rsi quickEquip: false slots: - Back @@ -77,15 +77,20 @@ description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi + sprite: White/Objects/Weapons/Guns/LMGs/l6-icons.rsi layers: - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-3 - map: ["enum.GunVisualLayers.Mag"] + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-4 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Item + sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi + size: Huge + - type: Clothing + sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi - type: MagazineVisuals magState: mag - steps: 4 + steps: 5 zeroVisible: true - type: Appearance @@ -109,14 +114,19 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi + sprite: White/Objects/Weapons/Guns/LMGs/l6-icons.rsi layers: - state: base map: [ "enum.GunVisualLayers.Base" ] - - state: mag-3 + - state: mag-4 map: [ "enum.GunVisualLayers.Mag" ] - type: Item + sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi size: Huge + - type: Clothing + sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi + slots: + - Back - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -130,3 +140,8 @@ autoRecharge: true autoRechargeRate: 25 - type: AmmoCounter + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1ea5c35eae..8e6247ebff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -38,12 +38,14 @@ description: PLOOP components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + sprite: White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi layers: - state: icon map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi slots: - Back - suitStorage @@ -72,14 +74,16 @@ description: A modified ancient rocket-propelled grenade launcher. components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi + sprite: White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi + sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi - type: Gun fireRate: 0.5 soundGunshot: @@ -105,14 +109,16 @@ description: A modified ancient rocket-propelled grenade launcher. components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi + sprite: White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi + sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi - type: Gun fireRate: 6 selectedMode: FullAuto @@ -129,7 +135,7 @@ path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: MagazineVisuals magState: mag - steps: 1 + steps: 2 zeroVisible: true - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d8cdb8e0d9..c2c458ca3e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -68,7 +68,7 @@ description: An iconic weapon of war. Uses .30 rifle ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Rifles/ak.rsi + sprite: White/Objects/Weapons/Guns/Rifles/ak-icons.rsi layers: - state: base map: [ "enum.GunVisualLayers.Base" ] @@ -86,6 +86,10 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.AimModule" ] + - type: Item + sprite: White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi - type: Gun fireRate: 5 soundGunshot: @@ -202,7 +206,7 @@ description: A high end military grade assault rifle. Uses .20 rifle ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + sprite: White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi layers: - state: base map: [ "enum.GunVisualLayers.Base" ] @@ -220,8 +224,10 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.AimModule" ] + - type: Item + sprite: White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + sprite: White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 95bb4556e0..c04e7d879b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -71,12 +71,16 @@ description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/atreides.rsi + sprite: White/Objects/Weapons/Guns/SMG/atreides-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi - type: Gun fireRate: 10 soundGunshot: @@ -94,7 +98,7 @@ description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/c20r.rsi + sprite: White/Objects/Weapons/Guns/SMG/c20r-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -113,7 +117,9 @@ sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing - sprite: Objects/Weapons/Guns/SMGs/c20r.rsi + sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg @@ -171,7 +177,7 @@ aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag - steps: 6 + steps: 4 zeroVisible: true - type: Appearance - type: PointLight @@ -185,7 +191,7 @@ description: An excellent fully automatic Heavy SMG. components: - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/drozd.rsi + sprite: White/Objects/Weapons/Guns/SMG/drozd-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -204,7 +210,9 @@ sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing - sprite: Objects/Weapons/Guns/SMGs/drozd.rsi + sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi - type: Gun fireRate: 6 selectedMode: FullAuto @@ -325,7 +333,7 @@ description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/wt550.rsi + sprite: White/Objects/Weapons/Guns/SMG/wt550-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -350,7 +358,9 @@ sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing - sprite: Objects/Weapons/Guns/SMGs/wt550.rsi + sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi - type: ChamberMagazineAmmoProvider boltClosed: null - type: Gun @@ -410,7 +420,7 @@ aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag - steps: 6 + steps: 5 zeroVisible: true - type: PointLight enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index efe39cfb8d..08963e423b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -62,16 +62,17 @@ description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. components: - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item + sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi size: Large - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi quickEquip: false slots: - Back @@ -104,7 +105,7 @@ - type: MagazineAmmoProvider - type: MagazineVisuals magState: mag - steps: 1 + steps: 4 zeroVisible: true - type: Appearance - type: StaticPrice @@ -117,12 +118,14 @@ description: An immortal classic. Uses .50 shotgun shells. components: - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi - type: Item size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi heldPrefix: db - type: Gun fireRate: 2 @@ -151,11 +154,11 @@ description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. components: - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi - type: Item - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi heldPrefix: enforcer - type: BallisticAmmoProvider @@ -177,12 +180,12 @@ size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi heldPrefix: pump - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi - type: BallisticAmmoProvider capacity: 4 - type: Tag @@ -278,14 +281,14 @@ description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi - type: Item size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi heldPrefix: improvised - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index e5764f1946..1bc77c9d07 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -57,7 +57,14 @@ description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi - type: entity name: Hristov @@ -66,9 +73,16 @@ description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Snipers/hristov.rsi + sprite: White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] - type: Clothing - sprite: Objects/Weapons/Guns/Snipers/hristov.rsi + sprite: White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi - type: BallisticAmmoProvider soundInsert: /Audio/White/Gun/insert.ogg whitelist: @@ -81,6 +95,11 @@ - type: Wieldable forceTwoHanded: True - type: Telescope + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance - type: entity name: musket diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 7afe60363e..2367576f48 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -37,7 +37,7 @@ description: ящик с магазинами для Лектора, заполненными патронами. id: cargoLecterMagazines icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi state: base product: CrateLecterMagazines cost: 2500 @@ -61,7 +61,7 @@ description: ящик с магазинами для CV-47, заполненными патронами. id: cargoAKmagazines icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi state: base product: CrateAKmagazines cost: 2500 @@ -184,7 +184,7 @@ description: проверенная временем автоматическая винтовка. id: cargoCV47 icon: - sprite: Objects/Weapons/Guns/Rifles/ak.rsi + sprite: White/Objects/Weapons/Guns/Rifles/ak.rsi state: icon product: CrateCV47 cost: 10000 @@ -234,7 +234,7 @@ description: Ящик с тремя обоймами нелетальных магазинов для лектора. id: CargoLecterRubberMagazines icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi state: rubber product: CrateLecterRubberMagazines cost: 500 @@ -258,7 +258,7 @@ description: Ящик с с тремя нелетальными магазинами для CV-47. id: cargoRifleRubberMagazines icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi state: rubber product: CrateRifleRubberMagazines cost: 600 diff --git a/Resources/Prototypes/_White/Catalog/uplink.yml b/Resources/Prototypes/_White/Catalog/uplink.yml index 57ee01636b..d46520b412 100644 --- a/Resources/Prototypes/_White/Catalog/uplink.yml +++ b/Resources/Prototypes/_White/Catalog/uplink.yml @@ -46,6 +46,7 @@ id: UplinkRifleAk name: uplink-rifle-ak-name description: uplink-rifle-ak-description + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi, state: icon } productEntity: WeaponRifleAk cost: Telecrystal: 16 @@ -189,7 +190,7 @@ id: UplinkMagazineLightRifleBox name: uplink-magazine-l6-name description: uplink-magazine-l6-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: base } + icon: { sprite: /Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: base } productEntity: MagazineLightRifleBox cost: Telecrystal: 3 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6f4ae6d372367213f2373618a3bccc0e4a82e2 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0t4( z#W5tJ_3gBST!#zD@1Du4pv}GiteO04-`tNe`B~Ci@-7H^ zoK@xWYKXlZeSbdJhP`$C3;0_uebspE_bA+*P3$9{`g7!DXRhq4~;$uO-r z$*$_Bpn6E}{6ryNGxmRmjqFE!gwzd=uRG2lQMQ&nZocg9Z+36KuKnD)C6U44mu@%% eYe2(N#=N)FUE&xHY8?dnjKR~@&t;ucLK6TYl4(Z( literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..25065eb644463b84f556765b12c5fe9b818e78e9 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEP_K z#W5tJ_3f0sT}*}|t@{NNr#+O45Ualw(b2kN?^U~|_Yb*$bR^|(KdO{u{7;D|@j}|> zR*l=1lI%$ngIg!u`CT}vSUFqQF7)#)TLzW}h7Vi}UpI+Aj#wj<_~+-b^H%H$<)SbAwZI|)K=*O#z@73P;S+4!wGSTluk7kUvmT}kPh9liJuoI-;Ubs8{Cjlf5(RP!5fD( zp4%p+T~SLJyjr$h)0lX?o%_U3PNU=l%bCkLRvc+HU}th*;9y`pV0}QoLfB(VfY6Eu P3_#%N>gTe~DWM4fUnqd2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..44b9c66dea368c4a3ea6f442d903f9abc54a41ea GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0s=! z#W5tJ_3f06T!#!qT=QK#I5!5hJBbSl>g+22B>acJ{(!$oxjE~^M=GJ3UK(OYEUtDn zOaY=XmFOcP8FHR5X`?VUdMn1yhbD zV?*xu*-r9{Ia40iy=AJu;I>>-;3#K|yTS*SKCgv^VY{NIx5k}$qW#RqeB06^6;}?| zY&ul3&AH;#>nO1=j~3j}Uf*A)z`Z~GLFet8rALxaPwpvG@Vy#cYQMWFf7O?C4+a(o b7%E^DTW@q>hDu2a(02@;u6{1-oD!M;A~w^`M^!hMD%w?&uv zTQX!$n|$V=Ih(`YJ+|+^XqGU)ez>+%-!|uZj_$=n(VN%e)^$L zw7>0HyD^`q`JZl}gt65ANoTf~_HyMJZGNS`zS(Gl+`q`VyY9_tp7rn6C*M}14G}l? zzWVouvo835KCiq~FVdQ&MBb@01hOBl>h($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..09ac83f2545355ae78d80d98bbf64195ce972638 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQCQ z#W5tJ_3adYufq-^?fV54QzeuO1z#)^5!89LOS`&x-U03k#`l+ZPkFF!H-}KuY9U=m zNhj{3g;zs#Zp;b`e)uFKc2g2J@<9+xu{t>`W(!@+gDa@o;G=B>GR`hYp1XJ zBwBs%(hc*r-M6_PX*{g^;$#(jY^(H+_VCsFKHth>7dvXd`u3Hl);wRXPZ15h)p+wv zp2+uXh}FGdpSpm7oWbBD@Hmo3NV1s c3fTwD7B;RI+ODqp0SpNSPgg&ebxsLQ0Qb0wnE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..84d249d66db5e3aca358d01e3c91450fc954cd7e GIT binary patch literal 348 zcmV-i0i*tjP)UEMT!U(_1u%bL7%`E@CAII zzKaC!y+x1^JV{i7vV<1I_0&`pnr5SJk^N75*qQm5nSX>a2AA4$THOP901vPU0Nb{K zL7+^i6yuW~clQ+lMOl&0AXExKJU%}(=CSI)qWEy3XK{I&~Lw*M~x8r6CU&j+y?U!0OA8Gx8v=bZpr??6#jq)AqLzpGl0AdY11 ueJ23_t^-z=@F(Tmh91BJcmNOJ9N+`INlwpXBEby+0000dXmI3g4 zJW?8?{6%Yvb^w5L*D8$>J{kvrVUhqa$}-;HURiH904(Mo?E}=yzTR%w?+-zVg8*)o zeUj&VuU2A!&UZl%@Yn#K%P+>`XMgA>dEPpJiq(LE0GhN|X%$2Om056B-3C#1DZoil zZHR6Gz;yP~4!||tV}lsrG!6f=p)rIQ;ODTrc)nJJ#!?}FMp~y>TcCC7{P#g=4At1$ zLfu*;2*4-yF_ltRlLM;h3w!S_P?wTR)(o;BrXG75#?T*e9&Fv@k&&bT000047|Uh9^Ouh7o#GV_r>t mcHgJpgMpDnzyV5BG5aY8Nt_Km_xml-4Gf;HelF{r5}E*kPef7x literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json new file mode 100644 index 0000000000..40eaed0198 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f1814e3d6b0bd8564139cfc3a3f656691c6bc7 GIT binary patch literal 419 zcmV;U0bKrxP)C+?m0+z>n#4pX$a=|2h(WWPjk$DAlilq8A2U0XjgV5(rmeNAz5-YQtN?&@otGWQ zQ?Bf}E`8qz;B_`5jv}EZ(===b0Ql}&aTIATwF5xUbph!6KBp(gj3#3ME-$W{2PlSp zG#L{FQzKy`fPC2ZI|*ldbM6)k03QAWU|TNP=_H0y766nz&OZP+zuzQCmf7fA^8n9c zgZIxac-7;LFWxjP&-4j^nbAR~Y(Emk)QS^#B- zte6HZbzOkWtfs+w3P7(StdwD$G-v~4U&FuBP#HoS;AQ$$I$nrEWfLZUMvmjD)+^Qh zAdVvPewv2jw>^vil(6#2g*q<|h^hy+ZWV|!ah*MlQee|szm~TS@C6a5f!8pwKB@o! N002ovPDHLkV1jVmq&ENn literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f813ea4060e2f44ead39862bc4d4a1e72899fb GIT binary patch literal 423 zcmV;Y0a*TtP)ww2_b0ia%q;l>E$kW{~zz&d%1`-O=;3PjjFc*EkFwZY^l6# zS&nqmfo(H%T>xGd3!*R-ax#vCdH{gmt`&u$;!-mJ3~U>Kq3d#ba?E%-0pR-Trhb5Y z*vHcezCYIz)&j_e{cM$R9xQoUegbf@34s0gE?y_mlrjJy?eXmkfJ#i~X@ z383hZ<

~t_rX=qiHan0#K_6BV|}64axxPui<}bC=H^$72 z4(3FmDTE2z>cK@yE!w21z4V=4lP159_wrs-kt7LqTB}y|2A~0G007VAW#8{=H|Ycc zy)Xpeb+savQs_ygqG|wu@2(X~X}Hu40G%KJpcjT*U0yJq&j1+R+*S{e4f}LHW3gCT z30ncA!@l!Q_!wNXT|a&eOeWO>w7p|?-l3I{698>%`3}Ir!-)3VKc-;2d8W0I`2Np1 zrJ{717B**%==AK|YF#OS`@1py{*iu62E$?H0K!!RvH~d5Vojr91dw;gvS~0UlQJxm24jHz*YK}26oxPccv(K>j%T7!*o4iWk?(hP>rM3iAeNG}uT&&{ z+rtV#3u~WLsMF$rD0*PaR)NS9H`&uF1um`jYkBPepXpqH>2LJMjsO4v07*qoM6N<$ Ef=?c?%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..5fb1df7ab006cbc982f50465fd79e276f3b58f5b GIT binary patch literal 413 zcmV;O0b>4%P)gE8w`*lmS}yeiz%UE}7{@W!SC`C}3jiMOAKM2ghkd?W zuv)F1gq;A2Vc$)U$ZizrUGOvTx(5Iqj@V5{Zc07?jD03s0EV|GM0pB6_5mQ|mO=8x zpkhv`v{4nMU*gWdf*{pQ{;i~~T0n}-+wo$MGs5)fjG+3$I z0_5g34c=1#b`{~J44b6E8X*4~{+EW@5Y_;1>!fnL6ouL*T>gxLATq62oBKf~B}HGU zRQ$Dv6MzvmK7~*h#Q{h6pfNGeaq8m2; zB$_&q65_@cz0q(d0wL#1OM8p3)`GJ}tmy+_01N;sAee?Wn1=S{9tkj}gjdEi*R4n5 zD}c%vOne_QijX8LD3t*K()EUt-yPt>ORb?)hN92_02xIjK<97Ze7&I5niSRxz#&)x z^Tm=EknOg-0QM0$9uAPR85=;DQ-wH`NY@+0akKnLM=NqKDE1}w)%O7R`vddE5^*Sd z0d(F80p?Y3yVZ@T%yS+9P)`Fu-~Zc1ngZ95lu}J!a4ouP3CfR&=lRw_TH(S?&&L6M g)^DB(2f$wep0|5iIJ~_FQ~&?~07*qoM6N<$f{iAG*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c3f6004365033940d8a7a0404359a295e58f884b GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46Hz z;usRq`u2(D+LF{m&}iX(3)=Ilq}09vTYr2{N(>I50qo bFKm0Fe+iwsCpU=$XfuPStDnm{r-UW|8ErZX literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a81b015ac1afa96650cf94e17d7ca2ea4e64f620 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC^*5> z#W5tJ_3br7E+$8w)`#|+t}2``3D#5MuIl)@=3eUFwxdawXUi@hJH>3lx9$=55}uzN zibw9uHBH`}RnExrgU#W4*1^KY{yuzTby~`PeX^x0uR&~&q+t$XL5-1TK#XvKSo9t0S5-4Y1Idq--b#Z(*CkC Q59l@qPgg&ebxsLQ03vQq82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1ab96ac2d2e49c19218f49fbe03df4a4900784c5 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7ezo z#W5tJ_3gEdTuzE2$3E`AsN%@+P(x5WE4#ny+Hbw>*LO7Exp?&K)n#qR{3fwJZ&*A} zUhe0GD^V{aSFgJ(x}YJRVa@%!1$Xj3oSRg%@?KT z5NPjYNyw|_Kd?uH+2;Cn248Q+dd?L!A6`W>cG(Y z_pCV5!J(Udtz;LI$OqnrpR3uooo2lkd1=N`Yi}O019S9i1s9|+7rhm}7b)DFT7HK? zq}`MAz?^Gx4S6TnX8cNSShciaJ_|?wo?lW7mu6(2)n}IZwt5>-@<_t!80SENrH1~T uH&_@B{Qb6q$>5iINCT6|f`&fw|l=d#Wzp$PyD_gQNI literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..e53d44dcd24a7886ed3c2dad62f9a8199b32d9bb GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0s%x z#W5tJ_3gEdT!#z<8Xnp|65&!+knHwYnD=hc`B%GF@GlHlQt~E<<)oDO>wDP-Vnq`S z?;L-+qx;i6VPmnt&FT(Jf0z?2zd21!k68S&>iOD>Q(D;qmKQ5Cd1yV*_iZLVp#C*{B(_%Dh@AZJk{`PVDV^J a@R3b5z<955S&cK$UkskEelF{r5}E*Tt7>il literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json new file mode 100644 index 0000000000..8269fa0841 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "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": "practice" + }, + { + "name": "red" + }, + { + "name": "red-icon" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png new file mode 100644 index 0000000000000000000000000000000000000000..b5638cf6635beeca5a77258360322ef27b5e8487 GIT binary patch literal 392 zcmV;30eAk1P)oMs=^f~%7vXif@Iu<| z+(an~{YeCiNl+`%=^{jm7D`TIgOalflZ5YKCc~L%N-2u0N}=f`pahfvDZpr2%4k~Z z+n5M&APEnm=<9mzmbMo_5JjBmI;L&Y?_c1$V*o~jp(H;$APqMb_w){He1<*%=XGOG zfR|^C#k(jh7XZM+(<=biH>XU)Hvle)MS#q^U|u=m_^d}zZ-@eS1^|rjZhwqjHAIss z1GGC`QCMz(N8iV6wF(1hQ5fJ@CZoX+$Fb9K(a}oW3#M~V`s!|gIR2pB>Ec*sE&$P| zyJ;6lEAtF2mq{b?CX-?SkSqg$Y1><#++Lz3NE?#tx_Gl0kaS5&X_6n4YE@S$WG!4v mm*>|3dDh=N6PAE~1y}(V;9cJUaDJiy0000$B3QZ1PP#=%KX3!rlX()9v4hzqJElUkz!AhYR$7Qj%wh_dN|9Qi%~ zmJnaw_4stJ3{d_ABj3jog1l|hY}Rp{D*!sJwsN=@APnE?_1UpHWNya*?3&rX0h9+b zs?)w!*g^mR-RBtqhhmMp&H7aykZHh%ZT-O?{w42fS>80-0`2o4qM-PYw;Cex{CjfAK zHi-ssG4$!ZXXkDE=ZAk$TDM2okQ~S1q5sww!WOMs%JTp~A|Yf5`4nzUr|JkTz#=R1 ep>zpY0$u@u{B37zrQSjS0000z{myrckJ>Icl*uK-*;ry@Y%U2xre=k27&-J!_7Jpf>OGx;`l)s}%o zfd0T0g_Q<)Tr4oV-O2!3yo_)x6K^!eaqN6tbhHxpg84%zeRVrPntsq9xHy(s3PAMf z{Te00000-d=T`vYB;mw$@xzdA_Y$Rs01SG4iGOwgYp!Q5x16DuX$V)x4yaSsH+oyv0O;&!E>Qib7i#ZLP$!;OSXQU(E-wTCHidJ4AtB2!Lqm zZu<(P%ACMrkq#m~8kGY8X&V6iFx>IvZi!l82a-|>Jx+hcc0^~DBRQDVYOb*$8|IE} l&yNEXslT}=tN{KMzz2q^Uo~?kr}qE=002ovPDHLkV1h!Np8Eg* literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed185ba81010cfae95b28cadf96bb55dca6adfb GIT binary patch literal 386 zcmV-|0e$|7P)g<9O7_^PDED(`b4NXaOxi3K&>UKCqnp z+n5M&CJ9fJ`a0e_Wt;?%D8-d&V!JMr$t__x2OyZvB>Ck5Iy~w@aP!C_%>cN&9GnKA z&M(;YL|OF!0NxfG0L*)rezd9tD7_0h=?4GW!u)uz6f6b+%%7irj6L*4lPLp?{IMvk zHo)t8jXfMT1~62b;5jzIbcW}-dR+8rCGG{$ODw&$8X(JdjQla4W7h%@J-UZ>fwW4` zz;;_SqIkJ%1^~q}0NAd3FX;SsNowt(hebFt8akFfwc_7IqC(IDfw0eyU4L`&NdAYnBWGvCsFh zw{$G6d95DFwMh8XC%dfPjTfRGmhE)P{(37V*P+Mh%wP6J9={^IWTwoT!@oVcOT{~} z=k4|DzN&RhIQ5PPL$kru9v}ERX|?Imnr(WfOqGvl}GBz-yCmW`eyQn={<}* g2@K2<8_XVXin)f&Z#GmdKI;Vst0PiPkLI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b1ac1fef6cb2bdf94f110e131f18a6d06ad19e99 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCq3z z;usRq`u5sIUIqaXW(S`nA$hZnZM;5zbrb~)V;6kC{;b2pJb2wUW}spQ1{+R^wZ~@t iz0sCl59TvGs6N1Uj+@K+W$h0Skcg+NpUXO@geCxB2PaMd literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..1e9fe08ea7c9f0481f9775f1a24b4e3d13dcbb6a GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>Y}D z;usRqn*8VgfBVA@Ov@Oz)?Q&;%qLNLUgAW+Qf=pFzY5uvsAuwr2;S;&$ xwq7CU%G-8sUNQ$PZpk5(2D0~9B^Z4F z;usRqn*8VgfBVA@Ov@Oz)?Q&;%qLNLUgAW+Qf=pFzY5uvsAuwr2;S)J# tE8G7UnB9WTCd=gV_gEz$tA8ZRz>u9GY`x3v$3md#44$rjF6*2UngCEGF*yJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..ebbdbf4e8a75fff6b63d635523e4d884c5ac507b GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>Z7G z;usRqn*8VgfBVA@Ov@Oz)?Q&;%qLNLUgAW+Qf=pFzY5uvsAuwr2;S)J# ztJ>!m&DlgP_1b>6%NYn|%RSDhPC(Tq_@045X}*|s_8Waype+oZu6{1-oD!M<0!lPJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json new file mode 100644 index 0000000000..9fba93dbca --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..f7286a9ae087944c4b0d0b4a03ab781474c8c305 GIT binary patch literal 370 zcmV-&0ge8NP)Z7=+eP1)y<`U!2jr<@E5qZ zUAmM&>(pxzmxFY1I0v~{D+=GyG(_@_3E_Qmyzh6Pa?a7DE*f?306KsU0O*B$l*E|> zNb?+koiRMzT&c(BmwExbacS+R@zMLyXv|_UuMfZ*Uk`@>OeXgf#TtO8>5McNdCLJJ ztx5BooiP9u#hT5=$X!DLN^5@{yO+;{RE@Ww0}un0)>dsemb8KZO0tmjFZ(Xi`rEVd z-R)r$loUdG0_wNF4^_J|uz%kJf9If90Ix`Ed=}=@8G}JJgv1+e2*62m(5?)?>2naY zkigf?*a(0(UoDpa)%AQ9fF#Z+tz~5`hg0$OZL5+v69b4waUE)33;rFz2im=75@?y} QV*mgE07*qoM6N<$f%;n^TR1kQF7Du{;;>y^{!xa_Fe>MoVP^U1Y37-y4CMLK=FFV9 zxogdBRsjZ$;I_71Mhy}+wT~I^Y~Yn?yw;YhuE7kX=+Ln89r^{M}}T;rGnT`)5QP$KCcpd(|7#wA}U88Hm$4yyh6;eG1IWw z5WupY-aff~IAl1U0&vYddw_5*kkjH~Q7W#SwGQ;&qTGlgDbs3Lmud+D2$c^>X}=Vg zO>w!OA~e9e|DI z!FJ^UY(5XPTX8ZOa{)-q`@J4OI-dUoz_wf>Dd|hea#wtLeHOOmDg!9B;w-d%Rq*cs Zz5%j0eMV{GD8B#z002ovPDHLkV1fvpvSt7P literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..b514d721e7eb00af22914858f1b08537e9e0a4df GIT binary patch literal 429 zcmV;e0aE^nP)e5(5(8E-Ug*cQ8v7m5AW2p4E-5tm8xtI6PS#cbbr#5nRUjwWG)&PKQ za>*@wF+j!l0T_oN=Z9O?<;_F30LnO$a&EkEUavRk^}5*sDC50a4S;6zgdi9KaNX`u z@wL450g6IU@qNZ&2tW`F8I3}HS5tsU$|UTkQ#gBn<^F9p-*8-7Spyu*9QLOMF3SQ) z>n@scwY|fr^Z~$yibR$GxAug`f|xG~HoK{_R>|xw+KniZGO30|>6RdXrSlAQ%Dhh$hg>Jh;wVL!`?H{fQz*6&I zwQ>NKp9jXRSWU)U0F?Ql-v>y>^Pd2?WsgWo22zsliq9`kmRt6;0km3i7FxY3_;&zb XF1mYo$_E9W00000NkvXXu0mjfDHpfQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..5088c1fb220480a26082a539a0625d1ace02b399 GIT binary patch literal 427 zcmV;c0aX5pP)sh{gSZy@-5%9ylEKn1Tor&+>tMHP z0Mf4m# zZrr-_3Ea2cbW;MYAT(Af(!o@rl(>+DSWviQW2p2jGlcWa%(?fDilT@-wUev+7GMjo z1pxL;esY~k1W@)o0471e`N@I0y1UO7AT|!Q{xn`$Z#0_p`@QS{V&hu94nVtohVPF6 zxb1W)dm?W+K+(1-dmfV@0KoT0jK_i8H6>99L#-3@WzFOD;*D9$V%D;_EVxDhq7#Um zBbLX9Mn-D^NbBw41?$?Q^vf#{0jTK{yNh=Ktd+H!lG$FwjVRPQsfJZaOAtUw9wdeR zLR7TvFW;J{t#lF1ip(yKy4fXYU2=48;5|}Fimsb<#@aC z&`j3H!>HPXYYD`wrH(IU`A_gRCZ=5?k)jD6g9aLgrG)i?W!1~ zfQj(HJQHxr)#nEKnUL@MuS{RPN1k;--#dK#{FOvVR+mKG!`1sFW(nrUOBa>O8S;Qc zguZvUTzm>}&yR=z0K+h(jBbTalq3%TE*Fne=iFp+hK%6Vd-VMSpV2QcPXq>Lgkjh$ zV2OutF->!hYSGM$9`*5~mJr*#mDY@sb=5`&z@&<&QeYL(D3Wp31`C;l@vOkLt5$UZi?cGvx zMSRQWpBYwE;0a%uHe)dTTU-;ZwWR|~SIlVgdS0Fd<`h$pf!Ux?{iQ9wxCWLWc~@86Rso%5xWwhx603wF-gb;T#L+a4O5Euf3WA zufm(a*4VA&hk{6i_fKE=%PX)7fj@tLzijQ*6nIq|r7YVoGQ8bn*8Dtov2YFmNS_6f z&RTiyP&kJmg2K6I=24&DMFf~RUMFlw4bY+?G09d{YkW}<=@8hp*$-tl&s_?>sy<8M z>iu9@R8@&zKYk_>n$9;E^3O0|4r}Uc3)% zqBMB`aJhKwPGx!bu!B~BSMO0(BQ}j)5V<25L=ftFHi5o4G#1LTeKebVOP&q|g({_W~+8w)QD7m>9R3L~fUQ{vngnbrff6&-KmjwO4iE4x1{|jx5H-WA3 fCa^W$1h&RMrRYTD3+E#O00000NkvXXu0mjfx$X$@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3764275663b9488dd7b023520d7beef21963f773 GIT binary patch literal 683 zcmV;c0#yBpP)#S-4(An`YhqQWx3w1Nt?g zACOPTs`Npjfxwthys$b6A+3CwI-95qTS7CV@x)GGD9iz)(es{jrF%6VW{koAj9%LW z9*a&u+vo(ejZQ$@=mfM4HW=(~H1Y0^3ibWH0}~5TXv>sx&#@4;&TN||s;srO#Sw81 zO@xSZyBi6RQW~FJ9V|f~5$6xGu@q1cu8ArF`epUy0e+t)pCk)UXG)>$b&Dhs z`1a*1-oJZ|i?d6dp3k9)f}&O-Q_6`6fxUbY8&72gWrI>mB#FRus+@sU^WKUb0Kg}e zJCCjl-%-|i05F{@^kX3kjTMv#W=bJRR?o@)WEi~~0sszqj`1YN=x9;Tt~2N>y|#!l z56guO2D`=!n#!Q2a~$d)9Sy;sFFa4ba{wsRf1XeLK&>sU*S%xJ02FqyUnkfSi#TT< zNmDrn4Z&=QmmLrb0obDvC^Zpunyy?MSY#n1r9_&h&a-~n3ZU^HP;Z-oN6&(Nq-VIF zo5mdg04b&8V0WRCg>0usya~+aXFEqq>8Co^M|y@2$8T_Pc8QPQZ)!!=*-0O;13fG} z&6elO{{>?r;=Jy{3hvnH$q$Std3g<{iJVQp)I_Xqtx$?z>s7*%FYnkgzni7^3&szJ z)fjk6xFEj1`Q;k-_YQ)WjwW(JYqNqE?7<^Ap5(Z?&Ef0vg+GY^P2_IcO;JbY^X*^M z=Yz*%-FKmK1`0CkZ8JC41}^EDn{z+k>{CuC23Yr9sAY5l+D0d!ZFB8@Ub{2(bj;^y?12E625G?uZY(Co-_>M@$i2qN;CEN@ z?!y&cb6u4#Y~j0gmSGR~`PY{waMU=3R=5S$WGpM5yv1~H^+om={fGPK2dMpO`2Duh zF?8(*-z<*B^PQ9q@ctB8^(yJ_t@-{_RxjdbV8}hYx^gl9g=-?FN|KBBr+l$hV7k-6 zV6JrFEc1;?n)8lcJ|7448iS{+pUXO@gr<HEHH`t?b$D(aiVmNWkxwze`b9Y~X| p<=*)E`bQ>R!5{wH{+Z5VS>wrcO@%Srj&a3g&vivVwr@l>1OSf(j;#Oy literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7686ef2638032f17f55c4767840a2a4055aeb7 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@p= zr;B4qMC;pW8@-qv1sv|nX(sKk?muAKxSCn>FN^(Y`w!Z0{xI!Vh=^wOROnDi5ay_= zUNJRWP%krS>f9do&%06+%kI59^KO>_Q>@xWzXu^c4${IGj*BAk6*UWY0M#*M&U-t1`%2r)d9J2HJKfHEKCeCib6vc{ kdW#bi<~2M71_XnrtDnm{r-UZX-be=t+rI6fAcG460JAHPYXATM literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..afe555e390f723d399456a8d8ba61838681912b3 GIT binary patch literal 332 zcmV-S0ki&zP)HYT8r320*i z+6<%<%%*qo<>?i`%^z3E>IQ(% z&6dsEyGxZzq=c%v#Frxgp0_|XI*wB#-UCt#KOj;60Ta+h{1(cF$@=wle4)6mZ2|zk$dAq2HUVGcNsUCV(M!_%9xwrI eOh6kG(B=nGYdRRDD}6!$00004~KP literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..883a171788f9048fff34519c2445df7e63be4a91 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1Oo%3 zkf)1dNJQ(~X&b!`2Z*%okM7FY*{L{V>4k%9&p&waM*D}D-@Zowhu73!2zwM3yn7Jf z615`1F)Od*ap?pRmV*bYZA8v(Z#_`|Zu*>JA@Sst`7bl&AFQ9zV5YX9mop=o=@yV# z`;y80`ty&4-&h{xy`MMvdH4Rtmnr9xZZZY*ww?Su_sIPWQ>kN{v=}Tt>vpG}&aPxS za69dE+Sam_S)E$~B1L~BF&y|Sroq1Z^_7nE4Ob3YyF|TsVbN`OzHZO;D~mEYpd62)*LRB7XgMB*qRas}&pcJ_ znHNU@d@NQh-rilTUXl?i%A7180Pwg1iow@+Y~&eG9ejgig!T`IAv+lU`mbwR`gI#^ zgrp(vnwIOUGcHf|=$cm2Lq0;&$xK>bzD7@vwHc5LRJCWm^s@T$5qetoK(x&MK(&Pc z0>EY)eG9Sc*YN@^5%^EG{xzBetVsgaBmrwa0jQHnu5$Rdu>b%707*qoM6N<$f(-1B AssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/meta.json new file mode 100644 index 0000000000..b1770febb0 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..6b95fd7520704c2ce55e2360f7db297c5e0e25f4 GIT binary patch literal 1494 zcmV;{1u6Q8P)z32t=QU@wKv7a!U+wAw6sleu6xxd zDC7zH5`BukK%mgeLMg$wB_XufhR`%Dv++pO(zHjLI zWZ0Dh4uBl~(^cM73IKpxwhfmt4uHrF0f1%OWs@ugE@RyDeK?Lo#CL@q14t5ph#z~D za$x#}C3w1w={~_J@t9l*U0jtM`Ef z0X*N2KR_JxG8h<_q8o9UKBlOH{)ki_kv|^$R+hW7>j3uEL?dZw0`r9fAQ5PV>MpJlg<%5-^aIKF2b_y*gb{u(Fn-RBWW6p zVJsVP-?_?r5AWaM>znJ?{`ohwNR1%jxw7EC58d&b#=p4zU=2?nchUH`0UXxg9e82T z(`rQKYt^mPHd6(t-Aooz7~g*0#uK+U_MS&S5Q`f80UJ*rccGga0O0kjHz8N8c8SNU zH*M&1w-TEj$pyA7lkayJ+Rxi~^z7xpORc(9eh`$57gLami4tw}(r-j=O*6_=Zf5P{UM{19#PK55>y$2u~KE^_PeS-&a zv~Q8i!)+Y!4m>UvG-6s7-~ICw(eu!a1#Ix(5-;C7hCX)-MK?oA6gIve0MaH30HEa@ zbp3#EWubHd;vNe@1Yvnuod~T)qUQ#CU$m>$$WZ%N#w5-Jg$TKb8_Nb6Hh!Ea6a?=9yanL)X!4PG?$NMzd)b%48RI0jqBDJckn#M?V;8gys_rLyneh=Q=?Ga&Cu3z6}8Oc6OBsh^pbfb4hgecyXMj8CgHeHv;60>%GrDy$a8< zLU0o~!#v0(z;HHZ8nMAIhJ2B;!@?tAZ)bNDeq)75*a&WAjsWg^$J{?Z!G{}XfL2RY zR_=vK;o!;Lfe=O-d*lFBJ_1n9;>_%Ss!mdx;?BEoK2W+le2Z?0o) z)kf=mc&)KyLN~RTcNPk-15_m_Tb9Y!R&6YSGiGUW99qh~Kkkzp?*a~c#`SHIWC z(P8h>ePR55hfStV0HLexcfz1NoS_yR^Ja@v1qe=gTpvVVP%bNM)h&E|r@{9-4Er61 z_USyys>Ub-ay^pro&5lRzj!@RBa}9SWd=cn`8^JV(N&%jh5xlr=O?x>N-D+@Q=f28 zmoZK$oyr>~jjfH}lo-&bA ziAD@v=OVW#FNV^BV^$E1tHUjXg^5K8R{`PwB05|p2E=d~<3+15Ck-(bikOuLN&%Wp zd*JZn|I+g^@^V(X!1ng90D$@V>HZ&qGN7yy6OaUmABu{WrtUld01RE{LwgkxT~DkM wOBLWcV0J8CHG!%z6QF7WRbwVV)dZ@>fAdl7om=}almGw#07*qoM6N<$f_7E3qW}N^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ac49e3c624e08768519a4a164e1f703b047a0a7a GIT binary patch literal 1060 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..08c789148f35834375a328fd8f9f86423d7a9578 GIT binary patch literal 1411 zcmV-}1$_F6P)9qjz|j7Ho_rJe0XhfbmO$K(5KxO@-P%p5SFTXntfw|Hj<*MC#bO?cE zS$-ph7ggRcj95ZwzMQ79i=p&_$A70D!y9KVRhUdZP1K$IFsCm7@*8%K#ZJuENA<4F1qsXW!g*%U zZ!v0^2kHb0r97IA78c&0$Mepgm)#-kE@(lYJO+mlmn#=J2JoITpnmtsci#ufiRh!s zC_ce%?dAd`6TY z8h9K+*a-dXr(dDvrdfXC97D^z8P&o8Y_6|(?mmd>V&BZ^3r|A83og5!+b1E^3o|0= zo(jb-?5m9gW zzKo~PxG~TJ!qD75gE@H)03I*+uOX2K{GV{;e}+;5WGf&WDFLz-kd2f8*$T+Ul_wz4 z60TaUdG-i8-8KNARGjs^`$5yA5LWiz!bm-!(``o@FmB`GV602w+sg|8fUWI=vB?~S zv5o=eQU&HxC2SK!3K9`et=3Q~&ax{hUI!u)b%C%!FbvtO#`Xh5M&G^nU}zmig+v4l zYW28--RnTcSavdaLuIzM2#Gwvzum<{wDtAT!VG)<>fm?bcTxH{knRY{RzNncJOQ3T z&_BJ!gfM0R{r!4}5ElSFrUDRtcJH5B2h27uEzis3XP|6W6UuJ2p0GUsbQbW$3^YP=0UPO1n|rNK&d$E@(lOcQvkNESH5}vc4*81 zRRjRay6)0r_`^dRoo+kMF_K3;NA(u(`g%&h{H$?6CZc z^D4}x3L1}h0`UT(_<%w1%ctNXQzB)?ksUb(ID~lKH`eOmC&}sr9uXCL{g{EHU%c@F zd_Ob{gZ1yIF(4#%fw_0#-2xsFV6V|aZYCERqu`g#BlavnjptW&pMUvdXw1N)iS5y+GRCdk@&yz`Nzdl;VjQz{$l>@d6_7 z@qo literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..a13d3d1567e9ff5c01a27a749e8fedfbe2d753c5 GIT binary patch literal 578 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/meta.json new file mode 100644 index 0000000000..fddba126c7 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..166c79911f9f71f48e6acdcd641cfd01f4530661 GIT binary patch literal 822 zcmV-61Ihe}P) z%hjA121O7sh%xQJq}$@-Q*&#R>CDH?L#)^w$B{CdM!z>wLMbh|f_N2>v$OBA82$Zo zgZoIsiN3~ww&kRohZvJ?3wh290$y~a*n~orIn^{#L7=Q+>8|Ta=96w4add=%{-ikT zMIpwgZFKu~?j~aZ>)@+u^gIkL3$|S`EGpiDlEe!Z!jEFK^ffT^rQK&Srn8n}%dU$L zL&a95nB|39Srn?!f~6hOuwbDQR%P%SiK?+)1cku-@gEs=j&mp8M;gGwLbb{|WKv3e z#(0sVj^ijX?z%5ErAoaZ2L~MvY?9_x=K)N*Eot+jBQ6p(J0fZ707!*#T~{hoLaH!H z)9UvYbdl{Fo!;&&vYQE#ErbNngFc>`!p=pbkQ89jkdW96Rsa3Vz?-BNHdy73m z-(uP-Roz7uiQTY_F+n#_hSY><$nB7>;^t(#*!%ci{Hi zi9P#1Bf@#=mW96SuIxHu{3_!#!=OCP@)p7O84;i1s7J&Lh4Vxg8-_vUyoNzDX1j;# zT+2ci=eSyF@ZqRO41>b=8APiRXqOATb!g5_(&>7*yq?5jwrxwBRZ*=pVn<1}Tp@fF zkfWowG8z5+eu;6Y;Xt3FMvJo3<@E&Zasg@Ng#b6)i^YUPEwiesP$9si6d#Uuar*5~ zY!0O_8IF3;9mkQ%+vOrA;T~%GU5u<72521?QLZ*q3A6xA{a5jz>!NO1Xf{_o77>@a zW#RSv1AP89PMxFgx*PzBUE%=?;Dr+u^eNEwWZYvDbh?FDEIDqn8^mI(B(t=m)^}Z; ze)@s_jh5Q?uYUtzfeQ_oN=UJx4^{gkcW4s_hLO}2KH))jiQwNMg4PZg0 zTO|pZloF3Io<-EQ?U+?M&V5cAJ@(qSCO zkXVsI&sP@7$%M!P0s?4qM?5y0M_qBTqKT@N0N`mPm&p}L$WkIX z_@Py(RvNJMJKj1pMIMkVDt6;QpGtvZ7nS)pQX8#R3jsi*w9f&cMvEA*0OL?2s_2vY zOPTaKGxs7QS45R*KIRc}{T>jmRHH>w%jnbTdeXrjRWS!3X037Cjh-{|h6?rQuCpt7 z1Q6g}#AJ8A%uq!o1#Sv!-+{-1C;zv~vw&^mS-`gO=&y?JQ3N_00000NkvXX Hu0mjfP?wYf literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..8b9354a1632f9fd4072c1f3d43bd048b0b403dcf GIT binary patch literal 255 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 Ef<7VEqyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/accelerator.png new file mode 100644 index 0000000000000000000000000000000000000000..550bc84f88e571ced174999dd1c023f021065eb7 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6b zr;B4qMC;pY8#xafh_pNm_E>A>yM{I9gmcPeo(Xo&5v^hqE-ksnr0<*4^H#6%a6x>k zoY{-#iW`iLWo~xXHpFW-_%h~jB?L3ve#m_84fC4Vb>^QHnHZuxFW=Z3fBx=w*~jr2 zRw?FRKCkJMT&tqbP0l+XkK4R>6> literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..10712a8d4dc1d6fcb6b498882091d83d6259b5ce GIT binary patch literal 619 zcmV-x0+juUP)V*^65<3MF-6QEuSo?wCJqyW)U z@&rj5gcf(i@mNU9IHHMmhax+J6FWZ+D_JY~RHMoLIp^NFV>?1?&3#6zZUX;{MnK(Y z1k{a2K;38r)D1B>a{>6d_|22{BTL zSY(Q44unB5ZxkyMTpQE)yci7&qG$6&5BfgsW67H&gT7zcKMdfZKPc`4H`iVv=6EvI zn<7#vNu@*#eOH%N10af(bqa%3#lL)40CXLfMW(E6*IC7Q|L&p?=i{f(EHZ_|5&+NX zto<&trCpEC->eZGPo}!(d8AU>P8dPs$yAHCFQ4kNY5-g%GrKl6AHII0>#W+GuheXw zl*TYfr9@=E@SINJ_(ZX?LbUVP?&ptES-wGb1f|Sr|TB z{^-0^_%_%fE+f5xd?FFWN}J9_vEt@Bv4qW;EgNso>Fm5l_Z`IoDbs;6@;j2*!H;6a zk8HJR1{uId9d+L)RJ+!Ne|l2*rrcAdHS*l;gNfkP>q_?ReJ$NYeh4>aqZStof zwV{0k83F%ple-oZR3+2=tx_`@0d=DhP&XO@b>rR(_zN}j=PqIF)Mo$y002ovPDHLk FV1gy_77PFY literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..f1d8cea688c4ce39e952ef720c6f6c70405e2808 GIT binary patch literal 620 zcmV-y0+aoTP)99S8)39v2;o`B0UmK~44 zk|#*AL8y2~9FK)m#u1yS9Tw>fcI;dnDp{5MuSSz|`Tuj~jO_@mHTM}OO%wQEv;vw& zE1+q#0-8oEplOKV0~dgw%ilchJv`X)armNcF7wD2bscxb6eHg~$}_>$0DaFp$Uc=4 zfMuq5?m!rn^G2~E!L>1s&&%$ai&BH2|VmS*I{qSNzL&1whYnS!T-G_MCN$k00IvaB=ae@Y^y|IIIBh zoNghH%vN?iK7U&vI+@ON-}6YNw4E@5CexV~?_WLBRn-8vO6GQLY(9VeM$cKdIbW&y zBB_jFkV=Wje&IRY((#F6Wrb+xiQUg1rK)_Xlyst45pGFp0t1j+=PRElcnH?jRuy~O zV{gm1%oM^uJJp+2DG&B~qpXRpfUhvx6VS ziXYi}(+o0zk2>nUPpEgT3;*o2^i8>^N(J)V?SqNn^_yDuoqa9cM1BZ2W}^`t^)6H~ zAB~}N1Q`MUZj-wf6VxTs{;kq5S^-U?70@(V0ZrrH3-}96>*p@>fq^Xm00006sVZrOquty%stP0Q^>YU?0-@j&N9qm zG-1wQyTCJJ<#*lRh0k^_W!g7|d&jYg+|Tk2k`BfVX$UoWF+oDs-H{pWK#LeWUHx3v IIVCg!0BV^vH2?qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dda55eb4e98c9f2907b95356168b4847fda6cab1 GIT binary patch literal 729 zcmV;~0w(>5P);&J<~!lM%UG&b#4GbVbl@9BEgA-^nn6Qo{sQrkCbaNDWJp97~S zcFbp|+tafmhEg(=647)jIw>0feOHA>jarcL58o63Wvjx-SK;2W75I4l>P5`Y+js97 z`3j3;0Bmb*>b>-j!*y%>*%Z-Ex2M-_o1v6pC5)g>x2MI+t@}DD8vqC1AY7Y0Z$5sd zYz1YGW@@nSCHgQJN{R4)V_R#n_UXGS6r!!W;qz!KCB+*`NxttY8gqgg#{fju(ac8) zE`lK2D&g6D-}B;)e1&j|1wEUUDdLj=k+KUwH)@rzDhJ+x@p_ZNzDG{(2s0x;zVC%T z9zNO#t6(tkIn^@N*7kh$2?&QciS!JjfkfX`+ElLZDo#%V@(`5XRHRTU0{@3ShdT2! zdR{Be6_7;Uw$|na3kSdNDt3Lq-=S;;gN~FqD6vOA^>uI2Ry4>*2^*Y29A?M^V$(9O z;=P&{TTfc4_UF$b8$)ymXJ#XYjnZGScR1FCQjt!#N4wQz0NS+LWnihZP{Mp<2H_M7 z%i1n{wi)LN+6;5M6@0CJ?S4tLYd?LSiiEhzzg3*-0|1UDZDe3XeC~d_a4Ri!7D|gk zsVIzyqr)+sZtv23U)z0PB7#UIE@hCfw1ut%H~vPp5|A}k0_#j>cZUh`aAhw6zyUdoB8r zKKXmNukrgcm(T7HU@E;95dR=vY(W}h7J}HypRtOsZ&BXYK6(FTb0!Njr2Z^%eYk&~ zGB-oUR%-^HU$*ZuyUrVL>wlQ|K8+zqY_alzD%1M>uE%$u^JF%hH)hbg9=(-q+Ws>I k-;{+nGnjG*Ac$(lADdO9l2-2&1G=8U)78&qol`;+03GLDJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/light.png new file mode 100644 index 0000000000000000000000000000000000000000..2651285124989c7ab7f41f347f33ed0fc379a735 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tg z)5S3)qV?_dg(^v1Xd>?xW#?t8esY)@~>eI2XQc%iHwSY=#^2 zx4vP%62vf@>4wOGWejGl8#Ehy8Mod!d@S)?@tW6dg)_SE|JcIt{RDgK%!9TU+#|ep z`<@Qk!}pghtMtg;**2B;%=<0+F28%N74H)7WdzZl!<7)saQi*8ozqg8eP6i$yaT$7 N!PC{xWt~$(699cJR1E+C literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..459ea047e8bf36bd343a2e9bb14509bb2555f0c4 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6B zr;B4qMC;ob8~K_H1lsmXO`rB6iRF;Pm%sDbDpravuYa!mt7i=p!?pqj zlTuazl}Q_a3k5aC-#9cgbr$1`UyaMw?UTX z)5S3)qV?@HL#_q`0hf!t9GOkM9cthA_dSz%dH7qldIv|-(G3Rcy;uEoRXBL&$Yw^{ z2l{La3>kVEGk6@58D{-%5VU=;I`v-8*`HR^CoO%~KEGj|)}>pI?J9oy9iNfsynM=% s)xS6^9{&?GhUt-Fz97+XjA4tgP=}c1my2dbKzA^By85}Sb4q9e05NAs^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..9f3e9005fc5704277e7f99ca22b6d7b9c4ec48c3 GIT binary patch literal 1376 zcmZ{kdpHw%7{`CxT;{SYPBOXdNOQ?0Y`L8=o;gy?>XCBYBxQ1j<67cj>M*rJSVnAJ z@JNV+hPj**x#mtTbHa3hb^pgv$xy z8Hp2q2reUG87*Q)VshapydnWGIs8MAxF_~807xsl5FI??3YLBP!{&%;2{j@6(34m< zJZ(s)*2PnofpCOp>l?nWhOf6VPwi=twzbi^x_wV`>e0_!kM1kyz<<-tl5wzf!}Pwa zMzG7*BC7Ou{Ne|7NwtX`QRb`7>@d-xt%M-r4NH{LLktpk0rG>Y44LcXO*H@q`8N4- zkH|*vOSA=oXjd)(`ZZav6Q7Z^bG4=w_S;Nrt=}Y2(g@7~FTuyCcoi-#;e4*s1NvR_ zqqO@4shgxy3v^A^rHViybLvHam+IN4XGaf0ca>BPecD4Ijrh{Jh*m1U*5>S}XvGK( z#w$nOM2AX(BDIr1ZtVG&NZ8uCX8@gOwHzBf&_f7QoV}g-geN_IMUlHjTVM0q=@PEG zqyX;K3+`?O-B+>|47{-xahv7)Dvp3yI9RG*hb}nE?;s-$g9ymnbGaa?*nr_X7ezzx zO{E7@5#h$kORpdr?~sLXo>}HCvK{U1N|*8-eq}KS(yNlM8B6(FGMksP_F;ADRWi&p zZlU(G5uu^pp~!Ql=$csBd}GI36SIi?gp^G^4vtkEX?(^_vX!f<@#C2`ziV^Y3dXdW zE~ZD>Z8RgpGYEH4kIXD4p|+C;y4Wkhqnz>hFJnE7IwJ+lVsITNT=Niz-ZHO&zmyRo zZn>XImGsCi9|kQ-?lGoPl(Iw;?jxJ2Fi6J@&~eZ6x*tu4I1V91Hpd|Z3jDLE!+QND z_^Hq*+X7vL)#o?J&xVLW6@~Au^Ev&KU=ISY(@EOs?O7C%M7H_%9%1Dtp`Am!b<_5A z*Laa4X7eLk!NBl|kk=s%s|ak54*j5}Q}Tc{5EZzD%aKwm8ICYE`)X@>bs#f{)Isk1 zXCwjippvX%fU0!xj}86rxr33nvcO!njf=+t^9^B<6+9TZ|~>O*Llf=lWdg zVwVP=J|kkXL`=@CN`k7DtV}88WJSJneY+2(V>+6(B|fwEtC=2J+=Qf-rAeo82*dwR zGRpN@dT!)j4a;TTeFvCp*~$Vdn1@V$0j27(2w}+DuPoV%C}qL-G%eGMH?++1&rfw~ zl=hH01-qb?>8_5&1z!Ai#H65n6~n-WYMB%?>F|5LW2EHY9%Q)oIb2IG8wo*Y9=kI!n$>>|N%*f$v^_S%Gi46OA~R7}^W&~xyXo)mWcZZ+Pt;k)mf z#l)jf3+{Tqfxq4_Dvq)le(ny~M&k_A1&FUu@0jtFh}?D%@8pTRp>3MglG6}Ow#G8v&QKd>@j=EM6xR%{Zikyv-F}$opi1!M zHQ9&Xo1gJ(T$y0|+->X8v@T2yPls8|j*Wt%Ms{{nTxVN9!}?E}05*~+rMfpZe(28m gq*6H|>%ZKCywh^3@L%HCN?s;#aUu~b9I1?d0Tdl~)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..9f3e9005fc5704277e7f99ca22b6d7b9c4ec48c3 GIT binary patch literal 1376 zcmZ{kdpHw%7{`CxT;{SYPBOXdNOQ?0Y`L8=o;gy?>XCBYBxQ1j<67cj>M*rJSVnAJ z@JNV+hPj**x#mtTbHa3hb^pgv$xy z8Hp2q2reUG87*Q)VshapydnWGIs8MAxF_~807xsl5FI??3YLBP!{&%;2{j@6(34m< zJZ(s)*2PnofpCOp>l?nWhOf6VPwi=twzbi^x_wV`>e0_!kM1kyz<<-tl5wzf!}Pwa zMzG7*BC7Ou{Ne|7NwtX`QRb`7>@d-xt%M-r4NH{LLktpk0rG>Y44LcXO*H@q`8N4- zkH|*vOSA=oXjd)(`ZZav6Q7Z^bG4=w_S;Nrt=}Y2(g@7~FTuyCcoi-#;e4*s1NvR_ zqqO@4shgxy3v^A^rHViybLvHam+IN4XGaf0ca>BPecD4Ijrh{Jh*m1U*5>S}XvGK( z#w$nOM2AX(BDIr1ZtVG&NZ8uCX8@gOwHzBf&_f7QoV}g-geN_IMUlHjTVM0q=@PEG zqyX;K3+`?O-B+>|47{-xahv7)Dvp3yI9RG*hb}nE?;s-$g9ymnbGaa?*nr_X7ezzx zO{E7@5#h$kORpdr?~sLXo>}HCvK{U1N|*8-eq}KS(yNlM8B6(FGMksP_F;ADRWi&p zZlU(G5uu^pp~!Ql=$csBd}GI36SIi?gp^G^4vtkEX?(^_vX!f<@#C2`ziV^Y3dXdW zE~ZD>Z8RgpGYEH4kIXD4p|+C;y4Wkhqnz>hFJnE7IwJ+lVsITNT=Niz-ZHO&zmyRo zZn>XImGsCi9|kQ-?lGoPl(Iw;?jxJ2Fi6J@&~eZ6x*tu4I1V91Hpd|Z3jDLE!+QND z_^Hq*+X7vL)#o?J&xVLW6@~Au^Ev&KU=ISY(@EOs?O7C%M7H_%9%1Dtp`Am!b<_5A z*Laa4X7eLk!NBl|kk=s%s|ak54*j5}Q}Tc{5EZzD%aKwm8ICYE`)X@>bs#f{)Isk1 zXCwjippvX%fU0!xj}86rxr33nvcO!njf=+t^9^B<6+9TZ|~>O*Llf=lWdg zVwVP=J|kkXL`=@CN`k7DtV}88WJSJneY+2(V>+6(B|fwEtC=2J+=Qf-rAeo82*dwR zGRpN@dT!)j4a;TTeFvCp*~$Vdn1@V$0j27(2w}+DuPoV%C}qL-G%eGMH?++1&rfw~ zl=hH01-qb?>8_5&1z!Ai#H65n6~n-WYMB%?>F|5LW2EHY9%Q)oIb2IG8wo*Y9=kI!n$>>|N%*f$v^_S%Gi46OA~R7}^W&~xyXo)mWcZZ+Pt;k)mf z#l)jf3+{Tqfxq4_Dvq)le(ny~M&k_A1&FUu@0jtFh}?D%@8pTRp>3MglG6}Ow#G8v&QKd>@j=EM6xR%{Zikyv-F}$opi1!M zHQ9&Xo1gJ(T$y0|+->X8v@T2yPls8|j*Wt%Ms{{nTxVN9!}?E}05*~+rMfpZe(28m gq*6H|>%ZKCywh^3@L%HCN?s;#aUu~b9I1?d0Tdl~)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3926ed22b8ffd449b0f4315e6241a40219d30a GIT binary patch literal 981 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq}W* z)5S5QV$R#y8}n~Dh#cGRefYwWeaoC2Tp|ywaC#N9(%b!C%fI<|jl)k}a*F;H1RTp3C{&EffASNpp3nw2H>SSRipmQa*63XJ{lL6%y$yrHlwyXhcOLii^A~*mUG{dzF;<2K zx6Ld6uj)QoAuSjrSS`zEFR(-V_n#-`3n%S9pu=-9!|bA6-on>ky?xu)T@OE5!cE$qOv&al} z{nYSKQ$hJ)TH=lk`AP@>I3%2U^t?GI`Shas@>8PSHJ%rKvR=^jyrH`BIIqsU)1H?4 zKCNf|J^6Dq`p&A%&AL-<*q=;PDO%6}w4)k-jkFn5A5TMX2cV3VGOSrR%~Pn zK#t;&MtP2}tA1{};B{%S$b#z+f5_D7mgI;sz4;_A!M{#&Uf;ULrh6@3GD@k_kC>~J zPkniILEI1Rvd2t0uemjvzVYd-71y#Ckgi|$@oM5;vxsBj0WH9QfBX1~^@Oeht xO^sOQy;Kl8tb+n?Fap0TNC?}RE@X@(=)&ezVKyKH^_9?pg%3=BJde-~#c z_?Z9r%s1=Um1G#-Yv<~ZHis)zbtj} zy^JYhl^IGBho%awYmul{oD{X-#M!o9wvxGaTcdriNb|Dni*LQAt~i?!sQC4l?Xxyq zYxvyg+xR}Y%G&wC?+Jk&$!i!_ukc}DxV&lQy^IBSv+~w*_w!iD-w0W~{o;}vo}zyY zuQl)jouRT=pz;0VZ@;InJzBVuW7afZ@xuWYC-+%>b31X3L9*3-r)b*ASE3hX_8yd6 zx30ZF)g|f7qHZ8E66MWbtA<;2V=FcTx zpXm;pj%BKCI%q%PO4H(fzh8GGaK!65T$9}J?03(phBvZeMNd`E>lAF9wN#L&amTd4 zO{tq7L~>#zFgErk%wk);YvbE6VTO!HeOkF2=J4nIsuJeUP-&K$TDHPF zw>eA5`z-H@#I8Jiz6o*x@7ZA)y4J*T@k;7D=-n_m0pEgb4|@1C0G_>w2!p!(~g zOs~_1jx+soRu(fWY&!Sg^wDFoE4aMU5A0%y4W z$t3#yYMbRvn!u SiGBd)O$JX_KbLh*2~7Ztvbur* literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/meta.json new file mode 100644 index 0000000000..88057bf88c --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/accelerator.png new file mode 100644 index 0000000000000000000000000000000000000000..391b2dc9e069489e46e2eb93002b6b28a46b1d9d GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Ti z)5S3)qV?^yg}e<0A}tTASz>z|^%^vs4NRRI5*QCGht&zc?s?6_kZ_-^ vde`wUGnL`$%~&^RHuy5;a3%b%J;3=UUBvp+1?3q)$1r%h`njxgN@xNAMCnMD literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..f5668aaf0d762577d2adffd6edbd1ed1280c38fa GIT binary patch literal 719 zcmV;=0xc)0E3B25=C6c}tn8kI!x+01+9oO|zF2EsYVTgHc`3H&Se0-DBN zK-1U@Xd3TZfNhU>r`6-OJ$flVwaz_QYgiR+eb##n$uRfFgG5Ej{Xa2dH` z|E_(qSUC;=;NU>X3m8}yzJ0eVY~f-$4}lGqE_$HfH!&QZrftXhg_-ZeNr;FwiDh?| zI;H5ECLf)jrRzPLQUk5mA_r;i+lp+Q{!iR(f$OhK3c zkOYb>k`a=|copcBqSNX@%0fWS>JoV|b{{?fh_e7aQVC-L7s43}@VExLrYX5NOBeu_ zY=L8=ja3**WB@=_^Oj$-MKVH5=PPBTvk=6yFbs_kEGw6ClUU`MdP+QsLIMD`Jt`$p zhN|;6eu?kHhf?wyH0rt#(l`~d^JYfWYrqLKgr002ovPDHLkV1i0V BI|Bd! literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..dcb3bf1b32b87c6a5ba78c7ae9fe61f64b1f9368 GIT binary patch literal 703 zcmV;w0zmzVP)jGs$rV6N;~92`#*5#AG||v zyG+{Oki#S*B_Jqr!5xcK$vY5d2@WK5)zYeb7aRY0{=WB~Ukp)7;U(iu(**t%2LVmv zAfRa+1T>A;Ex`8&s?+Kz-yb{`pS{m{w17^lr_Rne0ALcw`|f?Rb4Z=1#Bg}6E-pSH z2z~+pqR2F~uLuC>a=vpuZ*w6fTuRCGc3fCveLU}}zUO5FqcAKr_T&3E9NP}MoI`tL z*TH4vHpi>%0Kn0aRTR+oJbeD**Dw)cJe9x}Pj5ybNDs`zrL-_UiDT{A%GRY6 zUC!0u>N49OMKP?r$46lZA(lHtkQzd>a956ZIR|u9D%v0j4ChVa7+E|tdB&VlQmHVq zkWy`nf`&^e23MEnT}eG|{I1caAe)gcCe&Y|85naiw?91m#wlyBMN|lgqS#2Qlsw5t zLHFyl)7!C8!K^jm!o}U1C-lSy0K9vvz?cJl`A1<0hjC4q05AmVDv}eD<#-*ql%mt> z!Kgw&!RrQjJ$EPX0j#S4J+X-pOQnSivBa+x(B<3+ah@;$%*70+tc`_~1{nab?V{)B zVwTR(()Csu={z*?JQ#CS-}4G3H_cU*>u1E1L=ph-{Xr>-GSpqS^-Fvw?@P&_^LBx} zj!>E&1nV5nT9;BX9A57vp}nq=B=yn?0IV{Sb&*yrqWj0TS;6LFhMSwOJMHX4coVgr z5_x=}@0BjKTEON#`JZ^yV@`-=mO4T#Ay*0HDyg-%ES+q7U12({o{>&f*gFEx4X^tT l&2zv(K+`w~Xc{kGz#rcCV`XIwH^Tq`002ovPDHLkV1iv+Jl+5R literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/flamehider.png new file mode 100644 index 0000000000000000000000000000000000000000..024b49285a844aaa81ca52859efa223882323e5d GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W+*6 z)5S3)qV?^yg}et0cvu6Mt1MaEQu4oXk$c&zu33Ss>|P+>pkww&no$lx<>;XT8j30xe?j MboFyt=akR{0C>DO_y7O^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/handguard.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/handguard.png new file mode 100644 index 0000000000000000000000000000000000000000..505cd71b996e38c631cbc411f2d9acc8a50ec1ce GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<66 zr;B4qMC;od8@ZYdL|PwCex=nSFoFB(_xg3aL{>d*;-8>*)wa-r<9YNI)o15f*_}06 z%fBV$KhR>`pxNNdn8TG2%rKkjhRA_y#_{(`YdsC;pP&C$HtYHVKZT<`7kL&(ewMnz zSyOAfUh~^`+Ccv*TLAI zI0pM8dfBbbr8gf6G1v+Hff}pL0tM|5OOY)*vD>h8H18r=lI8cl_vy23aL(~RUX}oO#-ENQ9t4-eR_SVIx@N=Fmpk8hAR?7wejDw))y=!}pQRGvi z-#_J@&LPguert0@MF2p1FhHV4F zl@+b)x?1qYK>+E8Aa7aaR8o;JW5O8EazUU%2ztjy@cqQPDB{|6jy8gkbUL0;3!)O1 zRhD6YdisNXt2P(0LV)iFT3SWq4b=tF&(mJtj7dnN$j!+Q?PDnlIp zq35A&*@CbEKocmch$2Mhcpg*;LA~09R)v6A)HU*A?w&mWm{$R^XBw1-TnMK$#N!lb z*tTY|N*Dm{=neL*8YYZsWB|Z4Y`>RmOBAN$L)iOkX z*G#Wq;(ef1r3gg`Cz0tu7E%tqbV0RUKIj=DFYBMH04+=YQ&mMBUj*~=O_X@rr;PP^yt$j%f{j(pM zv=`etP}qT@kZH7d$*mQI{s&$o-u6H7Yrs~(rtufHevKST=$$YC00005g=;@iQ8<`ggyO|fyo;Y!}v~266 z*`DWu=RQ+;{`Os|BFn2a3+*1ni!DfF%t8>pUl|z!ujtM{^7!PG(?3}p0{6ts`@Mem zR1SuWt=0@Yzij0^o6ZMqJO428eHufK*ka`aRi^)Sj(%Kc#AxTuxZ~ctr#w3KZ!Ldc l=!k5X#kvAPT(x_^YjapNDtFnLXF$g@c)I$ztaD0e0s!Y~Vub(z literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/light.png new file mode 100644 index 0000000000000000000000000000000000000000..4a30592e90d1e8e2e51525d1d62b6d0f65823f2d GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<5+ zr;B4qMC;q@hFnaB0<90l1-D5Sbz4qUxM#~A;hHneB)WI)i(_g>y&u&2CMZsr@7d)m z*f?|U4fYpH8O&HWXg2sV=5QqhGu-~dnEs8CAtCb3i{cdHoUKXsv$NjHCNaH}yQ#A; zEGA!k$M5@loqZNeVPd#pcP*zq_~%5oAIjOWisi?XV?Wm1ogJRh(IDr%r%?`M+H9s9 hA_tZ+Y%EWvf1q0#JYD@<);T3K0RUmQReS&d literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf61ca8ef89b17497cf6a590f70334f3f5bf9da GIT binary patch literal 255 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ec49fb46bef613e066f523429dbf4b57bba6a96e GIT binary patch literal 1048 zcmV+z1n2vSP)abKsXA@h`MZ{=~f{s*uGfUn_dX~ zjP0u|^bu@BQxZxq7Mh@mh+_mU4Ji$$7xt(l*^Z?|?up5KU@UoL`#-;Cj%=S}K}2}W z{J|}N8*2c!0B)=S+yc0<25<}D#u~safE#N7w*YRe0o($(*#dyW!!{D7007^wC#-_* z!t3yW0N}&Xu>gQ4e{SD;yeB0-ejEar8Bhkt*`_p|h`Y;N53j=mdhzN|?~*p5EGrFY z{q>S2slu~X3u$_M7me$LzMP(BJ6}#u;W*p$?Fyw$xHSj-^Y0r0VtF8l1p!krXp@Bo1VKpcZU>1{nS-8`HR@a|0+rsKksGP_J}0Mv9`8mFU7ce~qJnh&xZ(C&69jup({XF-cZDe|Pm#pO8~ zjpY}Po0}iEj{gpVAk4NCrJ$E_yW0T((lO~{GPTQs2Y`#qbFsU#w=ut;o7(lsGfc>_ zWj;weR&wkiQD#K0a=0@QZX89?Qi!H)l6B@KxxzN`Df3ELa1$1#n{x z;1Idi5zYh@xKB zrBXMQli3A68rnl;rkMCthCtLMSeOSVB3*v=~Ag;05u(#c6avBXl$X;*g_mD zeE$4D_V=Fy0EYcR?Nc-eLi+n)+N<#GYO15o*Dq~=?i0AUJkN>?iBgDTg|~0tWp(&C zR%Di_?}OQ^VCtxo(guvvkw}!n?#|xam^NqFAHesgiSa(7qNqp3MvZlKs#KZ*FzRZ$ zhe%gl&1MAOmk5H8qNsN#BbN0ljMGuB{iP17%z)gs-k;qIPfAfVK_|wlBueFi*MaM? zI_sB}3i`z=Yob(kCQeR{&~)6nW`wHfssH}{fBHR(RqI;2Rqyp(z>`u0L0A-&Yeooy zu+nrrIXTK|_;m-n2th=-X6dRdD?861pnTiv@8aU}Jlhubzr&9lYXG+ZZhiv1W7IjW Sb3w}h0000Tg z)5S3)qV?@HMXm+|kz*gt1;bKqF52DT$p3KV-j?uy?noW)&6yi5Qs+0nzaA&C$3EHM z>E7v6QeUv%OJa~>z97+XjA4t-lYq#t_ilWfvprKpaAK+C6>)D{L6L+U?b7RWKI??L zRPZ~Z9?v+ z@}lT38X^E-!C3+L`u_A<=M*5MoP3vY-Y426Ijp_8&N%OndQ+T6#|tT0#<^G0CQbo1 z@}j_YJ52^e*d6vL%QsZj2QH`cC~0fV5UUVTE#`U`TCX`~VQ5NTUj?T}kyAMU!r<#cYJfw3)JcnPR$ns{AQRlmEoeu$wV z3bs&C4;U6<-F0iPp%JG+-ES_Dy0W48O`*;@m^K+RCz2_oEK4+P9LqRYH`7M-_l_L1 z-U3_*DH({=ZBOXrN9#IF!Pcq;@MkBnJ_9n&)uSZMb0P+>3b+z5ci*(dy}0I4&jjLA z0cL#e5;B2=lq@d_WSr~9jjqC63n?LG^!T)$C85l2;+W9~Ol%ZAiGE`W#m3DVpBm@8 o(0}LY|IjP~QnLt1%_1N*Kirer2fb2<{r~^~07*qoM6N<$f`XscegFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..b7a0ae6e99e00839aede8921d6125759a445e807 GIT binary patch literal 493 zcmV&NkMX5dNU2z8I`7EJX0vPAmY=+4|2pqp# z8$Ld;v!uPxbhJWfWQZW4Z=uz4Z3jrD?DdM$!C3eH*f<|jDQvf|0Dz_u*zb2yVxm^y z>E#(sBLE?cExdMMo@d9Z?y`G(Kh1%2TZV`d&@^J;b$K}0>iYU2hgOJW3nle{u}DQJ z>Ee^Uy2O1JGWS9v&B~?{?19CC>WWe`fv-Y?9Z4#Mx~|=A)Sbk}BkzpfMz3*@5nok3 zX8H}905a^FF2r$k6K*Txl-?{l8 jnpr?;W&x#{1(fCo{)@k{0cDQS00000NkvXXu0mjfNh00m literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png new file mode 100644 index 0000000000000000000000000000000000000000..758a3d79fd60b6bfead00bffa7c83d628d41b2aa GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W+)? z)5S3)qV?@HYpwvan_77B{N8 zSl-#fi8 zWSV8&qGk*Lh__b&zP>-5_E`mRAqL+ily;7`PTuzR)(NHERj-RvD0?mhNho!4TE{BD zM4DyT?S{^PG3<{ABa_6+s=4LAq5G`Vxg*NMLw?U7F>9j_o<>Uw#0;khE z0HCTEuGhjzj8g>m#{;U00gS1%Fs4Ilu$?@0jpBT1-hunHwBaP6s@Ndcd0BR+YpRD3 zYR0@%$g2jl6d~=pNv~TW4vpI1Y$8=;eR1nTZR%iHWJK>sx{y52Q8#uZp;Y#|jqIKs z*k+vt*x*7CFedvop`5?l*P;tHM$Lm?yNT5ukWeb8oYe1$5S$`lb3i|RJuSxU>ZzLX z#3cem`;6k#fw&MP%`zmEs=^J9LTn02E<|wqG~Fe>L>F;L>jMU96x@j((S<_oqS~jz zItxv)T2ZMYpvDc?8Rk(e{tr#C0MqFs@>UID@eznAVxoq*{2LWVDTxmcmY3y W`|;8_`wvtA00000H}bAK5UAbp@1&ddoa3R9=GR?x(L7^L#Ab)fqnhdAaFK zz3uu>3=LtsnGYmdKI;Vst0N`C>;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd0d589b42e01c9c10a3d708eab792e997bfb4b GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<66 zr;B4qMC;q@3;CKI1X>>MoMkG_qj-RM&f$dYivQ}2m#&!nSi5S)?t&zRnelUPrtE)m zB({s=&QA8~##<~2>I~M5H#iUYF_bZF5ME$r?0%hZf3eSHnOJL){U2X4FnqM^Gx(fw zXQPh)m&Xw{HLMI$-!E_O{HtvIJKC=3+>Ps^>%UL)diJv6mR@0NmQcf7hBr_%@5+5( Yz2hsrwy`OA8_<;up00i_>zopr0ETk z)5S3)qV??!L%wDM0hf#KIXaJ>igkKd-)1uBpjfWU{+I@(geem*?zwmA-_|=8t}M3I zE7&uhGMKWjuyi=fn8g=R+%Svzip+v%5TV=*OPfB+d6vu{s{E$}&3x{^D`k^>X+86D z=5O2h|CIhNXqL{XWPZ7O9bdLQ+Ci3w;JRiI99kbcfDbif?xsEym9mU}3>gTe~ HDWM4fD8x+h literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json new file mode 100644 index 0000000000..d34cbe58eb --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/58c39351887ee7f3793d96fafa28238ff693756f, equipped-BACKPACK modified by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "silencer" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png new file mode 100644 index 0000000000000000000000000000000000000000..ca93e943d61baa450bd2205671341b12f34adfad GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tq z)5S3)qV?^yg?tSLJS`9VCY&+ZoKpS&I-?x({ww_bi7bV=Mf>e8p4ahC=IOlCWcMJS zWq~q-EaM9f2XVO#i})+1ZSGrSwe@Yo8Zo{>qCQdaFV3;X`YBvK<6-cy85}Sb4q9e04JnK1poj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..b6f7e50f93cb8d1750c6b9c6697fb2eb854df9b7 GIT binary patch literal 965 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq}W) z)5S5QV$R!H=e?yJMUL+e=IS-~WDg_IA#_EbQ`478MZQH&0)O4w4#tLfP2BS!dtBKjvMQS#6OW@m=$~UU*P2a=k3n2-m4*EK0qt|DqGNgXken4sI zr1CvCLv_wE>~_uBCsO+{<>jsW(z9Q0`+c_M?OL}_zwh<;UCoyNb9jPrLllGQIfg98 zD;CTvSOXsOED&?(#U*$kHfbN<>acL*{mqQeD|w*S>3Di zj&FTlm^+yxx@qs#6Smfe z!e*RN>zNcHKq*iQrA+R*f;d^@eqbVJn|JLY!tooa(m%AD0%}eY&S&Y^zopr0D+FN!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..b6f7e50f93cb8d1750c6b9c6697fb2eb854df9b7 GIT binary patch literal 965 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq}W) z)5S5QV$R!H=e?yJMUL+e=IS-~WDg_IA#_EbQ`478MZQH&0)O4w4#tLfP2BS!dtBKjvMQS#6OW@m=$~UU*P2a=k3n2-m4*EK0qt|DqGNgXken4sI zr1CvCLv_wE>~_uBCsO+{<>jsW(z9Q0`+c_M?OL}_zwh<;UCoyNb9jPrLllGQIfg98 zD;CTvSOXsOED&?(#U*$kHfbN<>acL*{mqQeD|w*S>3Di zj&FTlm^+yxx@qs#6Smfe z!e*RN>zNcHKq*iQrA+R*f;d^@eqbVJn|JLY!tooa(m%AD0%}eY&S&Y^zopr0D+FN!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d4a59019a23eae2a394907a61f2768a26c3a4e79 GIT binary patch literal 791 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfr06y zr;B4q#hkaZ4D(+Zh_v?4w+dNxv?*Z2ky*X1-~Rt+o0b!&eQCujA=a0?9(B&Oy@itn znlGB15=5wD#sx7RVRZCJK$ZiRWCjB_&A(hFIC zKigd|@lpB7wV^Y3Q`@{Hri>ihoEsP&9v{w5{w#C*t)AC=o%RLgd>jw<%vt~T`NBeO zP50@w9-(j5`{y2J_^z6KyYw8-TGO)p_2SnLSMJ^(p0WE*=DPG}DoK;r(+m#SX)-fN zSF$i9P8Mi)=H<~(EuVWV|H;IpfHN2K3z8>;l!)^`==9kzef`^H^S)=nK2{-y2~G2B z&R9C?=D>R?PB`^k4W*3y+7yp+~wo{zq|lj z2x1LZB*8zk7(=)2Us+&i?)jQ&+p_duRZQ=W{y(>Wr_N64XusVr>pXc2O80cyGIAP3 zyIqw87O#ALGQVlza`|rp4?ewg7q<$|XWTr|{o}p8JG|aKEU@EF zlA5vN*6yfvclS7HiuXUteg18&bAKsWJ z^?VihGO>hpN-8IV`rFddmkSPOYpuN|a{le-MfES@-+#{Fca-=1&HT^((|@KrOgm1p m6>vXLlRlu^FuUFSfqe8*=dg?S<-P(_I)kUHpUXO@geCxJU}nSs literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a5e94f7d1d87e9d6a00280bd959d89b1d95940b6 GIT binary patch literal 749 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq`kh zr;B4q#hkaZ4fAgs2(-#GGrn=i;AC=j2+xa3`Tzg^1-_ek=E^LQENrc6Wh?xaW*qIy zT`GS4k683HkG<7)@;vt=TLlVE-|^(0peC)L>o6;)VGBd%CdNxlOHQ(Rpa|yOYiOFE zk;}la^ylY@tEDgIIKQ`TJGlDGpREB`OBoheh%rd8+0U&vXRdI}058p zye8iJU9x!f3g*lYF+Vyu-j*?|6dsXWP-e}Zy;jQpyH|E|`)~J*T&K)4YpUv8J2Y(W z*t0!YFIZ@^d#>~IJ36Z`OD#CY6TtA{?jF%SGv@lp{?if&)aZ45Z#!$5>*Xy!p4N#m z1V|lrT)o9X>tAF{cJmg89%=vcmdvx3{q2#^YwK`|Vwv7?|HxvtKluU|kMHBS%XO0> zlkrjt^Ac8%$-EQ96nxDbq8dyH3R;va3bOvWT^1>^d(Y}1nf)m*jt)bDw78EwoDtbLx`%rX6d?(g$6{B|y3(@5C=e_z{*j=hzwTX(MDC^~HNZvT2s zlee!w|GoAkh56Vc_UyM;s^sF`ci;UGa7pUTS?!u7A1k#sKhr3v;9B#&F3ZtfH@z;l zcXDc0@08xG?ni$gSI^!2+%q_dyZd{S{>55mzVG+-U3!o9zYm`y{b#qihw%dr#^jID wO}AgaRJpcu&0cxo^oCRarS}w~C!G5k)BT*^ep!72n0^^NUHx3vIVCg!0Gp;x!TTZ z)5S3)qV?@HL*51l0hf!BO&n4(3C(hh7OpHJ5)4vVJUUD(I5_R6pIL3b{rB$fGa)Cn zel@I@aVTau%V@%W;g$U~lic}}uJA5a$((=v_?fM`R{fgy_R0S9IsjLL#L%{Tz}BKF VU@h&rAP;CegQu&X%Q~loCIIOiIvfB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..adbaf4b51b82d9e5510d5296c380734f41dbf73b GIT binary patch literal 562 zcmV-20?qx2P)f4zMao&~_?7dxc2vR4XflrKCa^DB0d=DlP&XPc;P{Z6 zPp8)m0E;LB0P(SW|Mz!P5+H=|o;#UbaTqGQi${aAKihqNEu3qse47rIz{d4I?LaB} znTP$rUQ#Hi43z}ro!OO0o_H>i{9GRPgUTXASzO(&L{Cai3AhLrjoEX25GVyALXxb+ zdYyQ!0Xz~2lqz+uY^-Rm*5_Ft(JSunAApU}@%WNQgEM?A-@Oi;cL~ks+fKUNC87;U zz11cnXsx&Q>PeaXRxt$F;}9>R2(dAlbHGnpTI=k&sBQ0IBQ^%}dE{MozzzXgYYszI zx@l|-fFJj&yx3lABMg-U7k!<%R$qE4A zdlT)vMgim}q-41#WuClK1c1zGOSIF3sseltanW@qTs3TsasGe<*do6#d=l6Pt`Zda zF+0V7Euki$@&5-}0d=DlP&Zlub)ywfHySVC8YJ) A(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..09d19f6cb58b6630540887a43347247ba4afa0e9 GIT binary patch literal 552 zcmV+@0@wYCP)g0XMcQHgi9I)wV{`QI5S<2#Ka><;<^6#u;?v9wApoVAel+&YXT{PO|fuJ4hp3( z#!yvj@%&t6t$_>&3Z+^z*A`37y}kXB4!#OKJ^kkAM<+Z!J!D=Ifow=)>#0g#2Djhk&{SQp8H5az#0000TZ z)5S3)qV?@HL#_h~JZ_1)tkd(9DmbR!`|t4Xs4d^#hM-fyKla;BaGzFTTx@Oqf^}aI zgD;~A>je>qV20eC4I-PT7DabezVNjEAD7|Aaea5m+IN|`8EIR&f4pSed)WY@5TWCD a1K;~?0?gBP?5hCU&fw|l=d#Wzp$Pzbmp@Vf literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cbfeb0255e34497b266acbd1be875ce8dfb74d98 GIT binary patch literal 715 zcmV;+0yO=JP)Cm=5~NP9)ztv~ zAkZd&vH+{*>@_Y3DTNRMNire#_leUUz(IkK(%Q_`%~h@C{6%IH;up@(KLaVz-QCxE zu(^%v+bgGrb1tFLXf~5&*%d;hLGqcg5CWX@8DIS%$gVyK0p@7pNJ_*?Wtjt}YH`l9 z`>L_+!$zzWMkDE5c0dCG&belc);f)q0x-><&x7r~HW;JCM}=AfrUc3YiR z6L+@qVA7YVzW8=pOKVug?U;vYVr zY_Dee72SJxFJPK#>9qj)58CW2EFI1=X7L3SH_T$bGV2xdy+tdcZM%<8)_i_huwhX} zo6UKTe z)5S3)qV?@{L#_q`0hf!N9A@6PHiU2d_)oo4XZRVOKG=TcaQ~X8oTY*nl76T!K{4O~n`)r+k|}xrEP*a!@O1TaS?83{1OSwaNh<&V literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..75ed548cef3c88e9ea29f1c3a766b3b30c3fc8f0 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@pV zr;B4qMC;obhFpgYcwFauD|){O@_LoS`$S09T+h<$HuDn(wd@OzPRibT$Jox%d~b>8 zi;uZIZ-Tt0oN=sfi1Bfd7QS$dWs4zWE{v%e_h82D2SxkT8je*j%Va8GF!aiM9h#!P zq2oe@|Lv+@``B-k9zE^Hkif^-khtUWwz}?Vt8YHy+u_<`$#U$t$Mw4v_VK%yJ}8?0 zYt^d%sa99-R|zV*6;>`@n><I-~7zHi{nNM^bK{@&eIuMTHIk`k*CSVTh6`rA&!t1IPP94SmT_~o;=6{=N?UxLYu9Ra z$*w$f$7$a1~at< eXP>azJ$`C1r}0IXA<%OSp00i_>zoprfCvDy+i@8H literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..4439424d8392f5aea81f19af81ba3705d103076f GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@pb zr;B4qMC;obhFpgn1YGZT3Gg0tbGgj1OyFSHTAQZrA~p>boZMSK@hB#UE;G0qwW2n` zx$VH7tW}9}_0vS>_tE-*xc@ z<`r6;xv||3SiA(6WuD5KztKCnAuN2)0~UrZo97j6Z*9_c+%dVh$;|f-V|Z7<6U*t( zXX`|N*l{=7`(Ufy*T5-%yzRaAm1;VLc5+LvmFtyRD8Ei5^KZAZ1!Jz&f4&(FW@-z1 fIWsO-Hu66|VQ_e(+D;*${}?=7{an^LB{Ts5dO~aa literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..7914345e44eda85f93c00084caa7ea83d9378638 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@pj zr;B4qMC;obhFnaJJg)aU7M$47s$|vM8o_Zbs*>gWOU^wl-^#+wx)nIQBkpABxNHz{ zGvj#@y3$E*zG6yD&%`+|Gx#TTab_el-I~#0rnaCL#=Oa05-i>0ewkxK^w*p6?-}?O zWU6fa>aU_6&}qQg__XYt8V^I1?Z=o`o;P3rjHo!T!gB2}`}FLyE7!!DaWbqEdKflM z=A6ISX2#ajJZAz cv){1B2|YHSqQJj69_Tv;Pgg&ebxsLQ0Hz0PEC2ui literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/meta.json new file mode 100644 index 0000000000..027c78c62f --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "silencer" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/silencer.png new file mode 100644 index 0000000000000000000000000000000000000000..0f58832e98ce68b452bfdc0bb0a4ed6e96e7486e GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Ti z)5S3)qV?@HN3I412A7M5whb);RsUayhU_d;m33T-U#qA^JVL?OX&Le&1PvwX&eK?vZMD`Y<+ii zMbM^9qX*sZgTe~DWM4fe+^9h literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..bce6c12a70571c629656be3de13f7375fe818ccb GIT binary patch literal 1074 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfr0sn zr;B4q#hkZMcfF(?C2XUa&5T+mXq|kb_ee=Xpl8WaUe^8|0TlmtGlR7jYBm)_C1~*_rzw-Tcz*wpR+%E#CVt| zVE5nY=kFh1`*Y>Fx)_@W@Bd}(-R+cM`da>AsX~$eg~o}DuU2?x9cC6-_wr(~{c(x5 zdF(9p)^DoAWdA)`@Luw$xsgKVM}`d>BR4Y~5OvZr4q3&&S9{|rmdih;y>q|#VEX}= zoSbVumJ$oE{#x<(-O;1-JHsEc|Iao+L@HAJ;$v>%nKA#nwxQ$0z;FK5QCq(+nV9Tz z=)>U^o@_2m+QIL*b8hqfWOd7Myw0#vYyB#j(z?8Fe`}|$(Er)gJtzJukBPD4=?0nP zX}Py2re9BOcqQa1lpk+DxqGS85*6`+tE=KO(i^nAR+LStU;~D$&`0gp+7atMY)EJL zu-aqSX@}Dd3!nF{-EFSLx-;fsUAK=@z@yvlxh1;}N$Ga4ezcOWWV*u(J%P1Cnjhz` z^H}4*VBe9H<=PkQvXaZ+ABb94@Wy2I!yBvWW}LK{H-mMVZ%|Q*J}`z;mum}&ukYIO ze*fQ13<>4$860k?iWOb$T)vk@U=GXTfYNk_YQ1fOcL5+<9N?>u+!je zSmav1H5bFCMJm)OcK7GrQeAde;p6^C^KUaR>%GE|#dO7kcY&G%GIRgWxhM3q*eZ4b P3jqdCS3j3^P68|0TlmtGlR7jYBm)_C1~*_rzw-Tcz*wpR+%E#CVt| zVE5nY=kFh1`*Y>Fx)_@W@Bd}(-R+cM`da>AsX~$eg~o}DuU2?x9cC6-_wr(~{c(x5 zdF(9p)^DoAWdA)`@Luw$xsgKVM}`d>BR4Y~5OvZr4q3&&S9{|rmdih;y>q|#VEX}= zoSbVumJ$oE{#x<(-O;1-JHsEc|Iao+L@HAJ;$v>%nKA#nwxQ$0z;FK5QCq(+nV9Tz z=)>U^o@_2m+QIL*b8hqfWOd7Myw0#vYyB#j(z?8Fe`}|$(Er)gJtzJukBPD4=?0nP zX}Py2re9BOcqQa1lpk+DxqGS85*6`+tE=KO(i^nAR+LStU;~D$&`0gp+7atMY)EJL zu-aqSX@}Dd3!nF{-EFSLx-;fsUAK=@z@yvlxh1;}N$Ga4ezcOWWV*u(J%P1Cnjhz` z^H}4*VBe9H<=PkQvXaZ+ABb94@Wy2I!yBvWW}LK{H-mMVZ%|Q*J}`z;mum}&ukYIO ze*fQ13<>4$860k?iWOb$T)vk@U=GXTfYNk_YQ1fOcL5+<9N?>u+!je zSmav1H5bFCMJm)OcK7GrQeAde;p6^C^KUaR>%GE|#dO7kcY&G%GIRgWxhM3q*eZ4b P3jqdCS3j3^P6HL@mM zXR!7NUpnW;BB4{_r9X84iB`T-)c;$&zTn(L<{x+Tvca$gu?mY+D5b|DBL{!ZX8zbE$||_QEMlzq(7kG`Y4&Zr-xZ zP)V$L3B$rESz%|QcPeOj>~hP#+Y=wf?bTSD+%`+(ZiCwUJq*9r&B&Kx(3x(|prE(x z^DCK-9n6cCANV@+$kk^u@$$+p>^_AUkZ#7_Bx^>3W%IlF2{(O)3dCs?@%wd{md951js|U$~wyaqbcU0ec zRQBi2j0IB;B~47;YQ(pm{h?TQ{ZGH^7hlEao;!LsjXP!P6N%OQ3`*bbKN7!Osa^lF zF89#B2c6Hp?rVRhXY%~weh$GBiE{xn4OY*y+fggt9kV9v?dAFmHsb~V{=8>pt@p9} z)4wo`M$M7@f+)8r|!jp!3w8Sw13Ro%NV<* zie2OU)@$qDDO3t?40f2XVOOZ$7V`z&;nnOJU;m1{(6vb83Yh%l``Pyw&wqTbd*PQw zPSf(XG5lNk?c!9Xi{~5u_fGz!b*CLIP@d^uT(!~9u%*=um`NBsUHx3v IIVCg!0M@yU5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53ade3f42af7be052bcc4b26005dad76be96ea1d GIT binary patch literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq_NW z)5S5QV$Rzr+x*)G0<}7~tQGX-utTwFTm6(6J3)A*9p^WWZD+0edf@-7ipCFyn6 z93}xf8E-hM)lSjq+$3t~`h|h{--MOr{pHIq&z%v(1>ajdtwRuhKdx;Ch*4M(rFKaR+OjY4>X;BNQI&d#zagx^3>xX7( zsMhpI_$p1hfAwlfSLmdSc}JbIE5n~MsJ1w0skR8Hif3`lpD&bMU%r)dwTh#bYLKSk zvpaiQ1O%KI+COLLgtljom_G8k?Y;V`VQ=`Axz{C`LRb#G z4BM;JCAM{czvcN}AE7no-fT}!MpS=T<;J1S@{N7g46mg}X5at*=I=Wm`S>lL8~EQ$ z{aU#Z^WgG`{Wyd zCS2d&dq=k>aKG36wdSWM8H%i%yX^kmPn>qWTL0IT$ED6pVJN6H3|u+o*gS1_rzK1) zZt8@a^d-NTQMKPXIsg3M^8eGG@BUm{{a!?|OUzGj)twmm>Thq;{~gs>9wU6c=bF+j zK1G(a&6@Aty*aHS+Hm)-s#agJTkCw3Qhvzu() zuCXg`?QQ`ZmaYX%UoUpoh%oKAv%mi?d(}Bcz3=)`_sjKOoMm2>WZxyW_LI}~7e|?A zNzGHd*v+u(;mX}xcLmQ*{p7g(q+Lc%m(Zm!_o-MClw ztY7MH2rwS?-+vNx=(Suwi+jtgqrVqa$i0oM?hj^=cx!PzbfVqTEz{XeL{v=LbPTPu z3cU?)rE0z{mP}z-v$ML8ZN0mHXiDvJFTN@Bf-{Vleb-#JXFbzz!SIVuXR1Y-pU!W7 zBz5$;$gB(7rhF4^I9izVcHKQrtLpW$4{vYHzN^*jr@8d@6~?fd=_h35R%xiZ{k8G; zPF(X`gyBL;MnRTlZIl6rbAPsJ-Q4&laQ2on(~G}n?cv*UP1CGlfq6m6!Tro!3BfP} f%~&^RHoRqaGE~V6&s}*G=voF(S3j3^P6tqE;6R~jL-EDQfAAsyz0D=3 z=#UVB*2Wl&ywIpQY!B{kpQKf6*#;5NfRVJ?kC``bKP;xT#z)4drU{&iRzTBe1vHHh zFW}-_9nI%=8UT_+9#nrR%k@&F%q`0@ReJBjSp>}IcRCEeoZgX?RK!8B0z8k`9xuz3 zB_Bmk08Vot5WOmgKfaSXpNa_y2t(qI9FN$h!ie+orWWUS0p=y8tO?F~$x-~aq&2j4ewfBP5s zdOaG^E4*=isL0BknfclU*EM;ApfL$uDON*yqybAsrz!D_w0 za4^c1U4NTsU>A8Kz@!T4t8zb~DdG~a*8vw%(}+kI`6=D;!Nc1qu77~ouK ujz-lSVC{FIhS3UW8m)k)(F$l9e*qc_l}>#cW;g%<002ovPDHLkV1j}fY(s(o literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8804bf6b51c682dffd9c86d96baa7fbcce4228 GIT binary patch literal 717 zcmV;;0y6!HP)>h&=RPckf$Y z3WfS%B?c=Y1cD=2y*_9UskCcbPU0kB3O*2IUwxgUd#|LJX|3^|@u6-4r=k&1HyQzT z8%EUIF<*sU&vy+L@D#g(o_}dT{w$?>GW0y!Kc#)l9Gxz2v&gS@yhe1 zsj}q5@Hc?dJTMT#ipcXR^T^pk2(aYYt~LuPH2@5RV8n(*DSeU$I-J`(#Xtxdmi5(LSYyhS7sV?IM3KRoZHFwCGH>p0-vuZ z1^boXFYhZQ214k`041ThHwO}>3Ldz-`vCyB|M|<-yUJm|xG~J42=nD*X<8?+rDvF#wrlj-H=%x9i)aokbD8e*12>)`gV%Z@RI>US10! zP1P1E4>|`7VN-TEXY_b~v)OtYo0p!?*6WQ1A^^a8z1ev#v|Bnaf*GP!4pr&_Lpmdf zz8fr8bM$+|jP3f%SOeRYHv&wkkg-b76B;5e0ed~*B5FEOvaVQkkq5wnAh2F?jZb0b zsCp6~be&$V=Jp2^SI7|0BYJ+SLaGV3uBgX!#M^k<`+B*pp04UUydw`z5c(}Rra{{lygoD(-W_lx_MqIj$D-U1KA-0v>;?2okK-mdKI;Vst0L>s*8vp_Q-pnH&C4=wIty@$I0)$W6iSjrh0>Bolw$hp1}e|*e*e*%Z!6rt;RU{3 zPdxeOa8N&&a|{`ilgZTBCkC9<^db-hR7R9~9fs^fSt07*qoM6N<$f?$HcSwpD+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/laser.png new file mode 100644 index 0000000000000000000000000000000000000000..4d517cd1a5b408ec110237849b47f916425c23cb GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6j zr;B4qMC;q@wtS3%B5e=9cjf(=($Y4e!z-ClD0>5g=;@iQ8<~aY8tj^RyQe4Su7;<` ze9v>ibDya^*X`$43`pnw%D8_MgDH2wW+YUJ>86>_`-?=O@KRrkO@Zo!B8E)vfxi@^x`WM&rSoV)+!+B!{z3b7Y%%}6q=I))6 jB(@-pF$+qB{caFy7J1wz( z$1^XN2lHibaKBl~V8*&Zv%!}!hbtkNVK&o^Al4a{ySCNeO_uS$xb^R=c2(Dgne8*# z8!B|XXH=TJo3YHe@9+kz*-8uyQs1|K4p%)q{nDGqmjbhomd-2O9e-;3O%cZGC6!Lm c$Y##la#M~qWa4!mplcaCUHx3vIVCg!0KvIf@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d76b8584c2bd7876022068b61595670509d05adb GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6M zr;B4qMC;od8@ZYd1de^|7K!Q83CgH#)7kg`cg2orI)2xep1bAogQsr4<>9}aoGJ(J zE=`rKYS=8%aE!r(ZGj;}FJlIeLo!3uXU6`$thMWJcdM_-UT1UeKi^x25K+O8Q`GAD z)_dDNEGthC4o#K0Z5t@&@B=opb<(z`X%@ZUsrmH&n<2MpyQbg|eHN&xZ@HH( Xlh|0k`Sv!TBN;qh{an^LB{Ts5&O}ro literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/meta.json new file mode 100644 index 0000000000..ad156cfb3d --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "silencer" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/silencer.png new file mode 100644 index 0000000000000000000000000000000000000000..7a58e7f2abf61eef940a1535cad822fc658fd103 GIT binary patch literal 207 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e909999ff93aadf7cf00b3e92417c02ac91961ae GIT binary patch literal 713 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4C3R;uuoF_;!|J{%r?|HvQnl z%*bVJqAem~F48?FtiA8pTb_i!5uXyOsW~geWKu@ZgJlheCN*sI;m&@@wmjs#XMD*w zne*$;ue9B(Zdvwb_xpR_cW&1GY5hFJ#eoGKE!fJ^cKG46wQCx~U8QWyD<keVoXy$k^Z(vh3pZ{Bpatna^W_PbY1B z;j{d5-%I1Q6$jfLH@tpWcfDisH4q`g}* z;hE&eM^5rJq5#mv*`*1Y3>AZkLQ=6?%#o7xNYi>My9JFu6owUurxBOqf@7vF- zm4X6{I8b93%cc2~wcE0NKF7u>_)mPw^Xb)=ueSmPA3ovq(ApES@%^ta^UuAJ@wx0> z8@|0R@`u6fvx}bVaNT8k$kB3Sr|FI~rNh~VeVyKIT`K7_R`mTt z)5S3)qV?^yjhqb*0xlOVH!=zyJP~8CQ9*kv2XBspZ%^(6odXU}n$92GQxbV&er|`M zRyu2~gBJS*8HZwqvy3L}7f$Wx_Pu*-)qEAtyB2$%9pB_R>0RyB(sPO*_xT?@FLMT@ h1g;ju(EZ)OzV)zx^$(f<)j%gOc)I$ztaD0e0swgGL@WRR literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base-unshaded.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..216ec9668cc967c779cee47597ee509d53b5649b GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W+*8 z)5S3)qV?@HLqP@wfg=v{q!=?QRbL!_@tCoT$2gL8`nyG|Zk@NXeK3{LggJxl0?z_T z2jhk^*$u|oy`AwlKlmMnh@>%`Wtat0a-Uu1qXy?m-Q^75fW|X;y85}Sb4q9e0O}nu A4FCWD literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..163be892d0b78973b3959781186bcab52d91650a GIT binary patch literal 626 zcmV-&0*(ENP)J02-TMEJ`1Ha3BeViGVmCIMq(5->I<0b}EP z%s?sSJrfaDi#6rOptKeM)Zw_lnLz04@4vFO-c^24gFpZPEa!PMDL1AyURsO8ao?U8 zAj>pnT1x_h1w=Cd0Nd?7)e%B&3^toK=@6^Mnh?p(Olx|0dcOX)R990oEcnMr}3*e}4V$%rV=g z_zLmx^hiJ>@~W7qfU=(iaTGrrqNJj>$r)%O20yy|t_#<);Q8WrFE5ur)~aizDG?RG zBu>tuCE!H?3_sBBcWbEWz%VCoA4x#VUU0< z)15>@)Di71H_xsvx0ug9e9CQ<_lewyF+%k{NC8l?I}JrN1LyNAmh(KxS`k{v}NT(@tX4_~MMcYOITvPr<$m;{WCH_yR6c_gH}3jhEB M07*qoM6N<$f|RBVmH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/flamehider.png new file mode 100644 index 0000000000000000000000000000000000000000..069c1daed0172c61a075e2f021761c0ceb158611 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W+)^ z)5S3)qV?@{MWF)n>OzjG)={XUik-WNdgE zb}ZS^2dLDFMNu-bLJCUVP)A6^0*@I_?2MBlnMyuV6xlg*=bU@*{6r|Fc*xjjTEKnL z8fY4=fu_+KXd117rt!!{5JD85l~U~O?yDdSiKPS(JCVYu*nEG4tMpG)IvYn(^Y-N!(`f22&o+K6eW3ZJi^GC1o%=a9h} z&^cu5B@BS?zJwdea3~A0Vks3++eEDjnBu2N0#Xvaf6dpAzlc9vlyWt%PAnV8rzZ-~ zm04=WX&|l;F@5)gC%~O6z#1@G%E_%=fjnarv#Z~gVObRlvGlu(teR4aWvyw#X+VpZ zCJ9j#32kJWB<%P;JHBsnmHDg}Xe_13e#_e-<0&mvZ=N!O@f`l9OKETa440umH(Sbz&|=mmtsc$#x}S?oO-1S%LZdmR>ig70lX& zluMYI`E{$X)@{_r=H_Dn1r!7U!rW0z*z;D+bMNc)|BeU$kE}J&G+F~q<2Qg)PgFoF RCfEP~002ovPDHLkV1jspI-39h literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/laser.png new file mode 100644 index 0000000000000000000000000000000000000000..c46e87530c29e4c570965e30de6127173687cf00 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<5` zr;B4qMC;q@wp@n{B-%f!KMJ#Va}{@WoD*Zy@Icb0VY1wE_RG={cU)dyOIsQ8Dok8l z^w;ta|CZ@gPEPlZ2^6^!>0H}bAK5UAbp?XBYPTTrYop@@-TUt!pPW)$!lZD1zTW9S z*FS6VGh}SFX5jf{`>wFZUwB*p!^HP#3^`(pl@C;z*5`8_zPmhf62p8ohM0BRi+FYF nXFh%7u9n7_CAI)Td}I1JOEoI*l;0ts`x!i4{an^LB{Ts5rjTIO literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/light.png new file mode 100644 index 0000000000000000000000000000000000000000..23c3e04adc35b24a957184bd0d266d4b1970b370 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<5_ zr;B4qMC;q@3%QsL1zH~Z`ueQkRE&%)Twk>4{eQmeL0PAMu3Y`r@yMHlf3(sP?K^I= z95{EUb?<>3rVYXka~a;SB&ai3Gv44lpeM56YT{bHHLqpY_BpqEaX6e~UCUSVP4@2H zX;0Jc{=JaHall9Okmtz34SR%9@q`;VLRfFDB{)X06EVbb4t Ts=}gy?ql$D^>bP0l+XkK#BW#c literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2c064b5fe7d433c7d947013f52f9c735232a6a8f GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tt z)5S3)qV?^y-FyuS0xlOLliT~f{{8>G;gjRuu&CKNCt6bSm_^^bymm*{)_endhZ=)5 z;|FW>U-R$!K`&L@9k28P+sj&7f`aeC8tmJfH|zvkiPXIPfnH;3U3 kOM*IF7t;pehS={7?3^m%c7KK5gB;A@>FVdQ&MBb@0BLJP1poj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e801b1d2f9edeed0cb05d0db372f49668913d1f5 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>TV z)5S3)qV?@HYpw$d08}wsDgV9hN!6Xu^I$ k#-W(uER2!+qk+ApobRn~wE!Q`eg;ohKbLh*2~98>016{TPyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..53b561352359546737de6bba6ad98dbe674ce6eb GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>TX z)5S3)qV?@HZN3HrftH7nO{*O)1`F_f-+v+O$s*V^S<&%6|4IFMz#|M)ifz&nf#+2=IgRlHlBS;=4^ qTbu&dvy8!vb%SPuFJsPO_B{e~#O(wZ%jW^z!QkoY=d#Wzp$PzppG8yv literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..73e56c8acb2007b40c2bf58e89d3ca4ff3850582 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tt z)5S3)qV?^yg?tSLJS`8k5Be^Ukhu5%Zktp>$CY|Z3-%oaK-M`wE#m#J^c*ar& zGu9274Ze&yhuP2Uwe!pTS-N;fc=pW8x(p3Fub+RsO@8CEp3NdQ->+`5VVKcpX#`cx nl@QD@o9Twgfn^Na9x}%XtP!!B^}Q-*GyTMwPn*5u3r;i4Vl-jSV7su7 zKVv=Hce}p2DO=O-yy2`@oB|P+>pj_7N~Fw@5w|i>)Lpqr$8$hJYD@<);T3K F0RW_7F%`Wtat0a-Uu1qXy?m-Q^75fW|X;y85}Sb4q9e0O}nu A4FCWD literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-1.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2f858b4944c1c00019500889a6ccf2d5679f37b6 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W+*E z)5S3)qV?^yjl2gGcvu4$oMX_O*{oE&ngGoB_NkIC1)_xjlD^M4O$@hp&ZFm6a=I15pCoBfZU3tw~CUgJMN Ps~9|8{an^LB{Ts5Jdil5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-2.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..5147c9a5c8cafbf739b0804624410cf0b6236dfd GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tp z)5S3)qV?^ygPaWpJZ=x&Vw?s1&nal_=y;IA>Mq#+K_yS9eZnW5zxx?4*%YnZS$!hX zRsX|OrVOqHnhnbsW-(=yo_cuuPL+MxL#y`!{l|m$Bp$7M)>iv5ZSIF(MfxAa;p!la csBet=qOu}fJ-eNr0Ig^6boFyt=akR{0NpD?SpWb4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-3.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..473a47535bafae036b11281c9914a2525c52995b GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tt z)5S3)qV?^yjhqbz0&WlI>}XR6JEx$vqvJtJ)8Y>2h|bw_rV6jHasIb{r{2lOvu5mW zpON~7d0r5MFQW3(yG+p00i_>zopr0G_2q1^@s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-4.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..6d380ee02ccc4babb964bff6e52c34d257380e25 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>TW z)5S3)qV?^yjhqbz0<90bBX%|`B|YR>)YQ$f?wOWVi>rX=ONPwzr#M~aDZbBM=l!YJ zw`Y~t3862{_mUW-m@h~)9AhwHTd*`<&W?YnS*+^svJ=K@KL?4=jCh`EtN-~MpYYrC wb+K+|m&?V;zi0c`#F)Y3kc^~}Rlb0EYLqP31wS`lpnDiRUHx3vIVCg!0Nn6JHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json new file mode 100644 index 0000000000..7fad013ea2 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "base-unshaded" + }, + { + "name": "mag-0" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-unshaded-4" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/silencer.png new file mode 100644 index 0000000000000000000000000000000000000000..957763feb9b191d4bdeb1b4c260f60856bf4807c GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>TW z)5S3)qV?@{L#_h~JgpBSxbzNgeerkwte7qcHuN!+oMtZj!nijn#DCS{xoKwl3M)@dEH01pn)Z9oGgcGhiBa+253Tv% zC{bDw5i}Jj{~-JHekYa%$_%oMFQCTg@>ejt`5cKZ0g#<9vu6!vj=G$IjLpIt~_O<2Si9T z9=+c?Gv8R5j|d@fm)TP-KsBiWss*SfH9)lh)uaZf7ND9tZ@@QE8a;UM7ytwSlBk+5 z!$Rlz`Cn@rM=}6_D3>X^UAD48{*nm*xVTEjqMS{FPXgN}Zz57%3HP zeEif4?KkQYAl)uo8<=Su3!zCM`#-5^IH_sKYWp~;X|N~-0)y0N>$OTqly?Dt39KZ4 z$%JVe81#mT%>clg1%c<_)yw;+pPr*R*~6G~06F}+2__tu&T|)(;sUX z^oF?1(?oN`#T7^}_~uy~BmFy!IY&;{;W$q0KDRR9_{b2)zx;%Dhb11oInks+#&s%X7$p*71S8vK}Zk<)bmfJG_Z4T1h- z222>noa4nalK{Z!p967o39Mry1FG6wv^$>jzke7mJ!pI8RS zZ2$I6BW&7#$WAuh2D*k$k%f7Hq6vU_j`06Y`o z_P_BqsG4Bl+i>S!hf@Po3s6mJfNBA%NexgfKsBiWss*SfH9)lh)uaZf7NDBc0M!Ci zlNz8}fND|$R0~i|r~##-jZ)D@pE0o~jvF`Ix z3?TCAb{U=+Bb18vtwvRCt|a*CqbmHfO7g@Q$ub@SuViNJzs^Gqkf$#G`Ue0UKCj@_ z%lk|1s@hys4(LWlQ=1}#Z@q6})c>1EZE=ZnFd|&nMf1#*5&&EW-|n!)>jWfjdnU}O zmxwJ#5X-6H@Hx;tYr}O1QY(=)1!065FrRZd-9=8vq)O5MGwIu)Y5}TA4NxsWHK_rr1*j%9K(zqX+<6230|0d9cE}Ok`~Uy| M07*qoM6N<$f(OSeGXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..034dc886d35b81f1bd86c3c5a6153c184ee3b2af GIT binary patch literal 1198 zcmV;f1X25mP)cKZ0g#<9vu6!vj=G$IjLpIt~_O<2Si9T z9=+c?Gv8R5j|d@fm)TP-KsBiWss*SfH9)lh)uaZf7ND9tZ@@QE8a;UM7ytwSlBk+5 z!$Rlz`Cn@rM=}6_D3>X^UAD48{*nm*xVTEjqMS{FPXgN}Zz57%3HP zeEif4?KkQYAl)uo8<=Su3!zCM`#-5^IH_sKYWp~;X|N~-0)y0N>$OTqly?Dt39KZ4 z$%JVe81#mT%>clg1%c<_)yw;+pPr*R*~6G~06F}+2__tu&T|)(;sUX z^oF?1(?oN`#T7^}_~uy~BmFy!IY&;{;W$q0KDRR9_{b2)zx;%Dhb11oInks+#&s%X7$p*71S8vK}Zk<)bmfJG_Z4T1h- z222>noa4nalK{Z!p967o39Mry1FG6wv^$>jzke7mJ!pI8RS zZ2$I6BW&7#$WAuh2D*k$k%f7Hq6vU_j`06Y`o z_P_BqsG4Bl+i>S!hf@Po3s6mJfNBA%NexgfKsBiWss*SfH9)lh)uaZf7NDBc0M!Ci zlNz8}fND|$R0~i|r~##-jZ)D@pE0o~jvF`Ix z3?TCAb{U=+Bb18vtwvRCt|a*CqbmHfO7g@Q$ub@SuViNJzs^Gqkf$#G`Ue0UKCj@_ z%lk|1s@hys4(LWlQ=1}#Z@q6})c>1EZE=ZnFd|&nMf1#*5&&EW-|n!)>jWfjdnU}O zmxwJ#5X-6H@Hx;tYr}O1QY(=)1!065FrRZd-9=8vq)O5MGwIu)Y5}TA4NxsWHK_rr1*j%9K(zqX+<6230|0d9cE}Ok`~Uy| M07*qoM6N<$f(OSeGXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3431cede773943021baf6b4cfa68cec4ee1b0a87 GIT binary patch literal 713 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq|*o z)5S5QV$R#yhJCjU1YG~KFkTVJ664n8H@IuI^S|P@n||yISP%Ce5ZTQe?6P=j?~MgZ z64m;CGKjLhxp@6~hmgVjDM5#nKc9_iFulr<&3G+@c@1ksFz*Jj1YgqwD1x6qu+?1G z`|;;Xli{%=XBZruIc_cAaY{nj&hF8w`zy*1NF-;?b-w@oRcR=<--_~v17{?hJQ!Ad zt}EZW@qOXibMy3q-#1*dluAA#(8S>v&BCWR=WpLkPyeUlNAnmN($#$2`7${aOYfc6 z{`c?SGTq{3CxR1t1Q|Gf7%7(fzgQk7?=(aI&)2W)zxMfGUbt%OmE;M1%bO)O{*s&e z-n`d4si|bDnW~v1Q(brd+}XY-Zi=)E2pONhd&#POSz+d?O8M%B4Ld55(k4Yeye8}z zwZF7)#>`_9&!_I6%_p!hxhGxwTIKxBO)6?9(qAq(S6$L&)tV%0u$S}Po64~GYnNKK zs5_tc*Jmi$e08f}@&C^7ht-Rv5_AvD%4*okkiClW8q=DUY!TcWmf;uVwR(T~+Q-U? z4>O+sjsGir$i#>76Z-~Z)nkueJ?w}+p;D>sn#VYkd0OA`6G#1%xBGrRti<+)*F9yz zH1T>H*^KP#Qw<*Ih&Plz?9iDe+4T6OgRe1vz-1HPbK?EDM;H z$iuL*w6AZubJ8_B`p=E87JgUOr(j{2zAg-8x;e>2&eQ zpVtCXgk##2qn>X%B&fZhdkv$f*u&4CpTBy!;g?)N{vYx6hpJZ~JlSskKzwPqRqYIu S^_jr5$>8bg=d#Wzp$PzB1Ug~> literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..124e7d89560c55fc9ebc130b086bd26cd9c02602 GIT binary patch literal 968 zcmV;(12_DMP)9FbsWO4B$p^69kD5;Lc6%e~2{hbO0v^(gfZj z(`btoJ+%CZBs)tl;s;D&j3|+hG(}5HVvNBjo`5g@u-_d!|2*V502r+`GNlsVNpJTH0H7>SxYqT2Ej{sQ z8a$s(kj&Ss0oHgtn#TB$K*leP+x^mWkc&(yq^X+J)77s-fb}>4;9A$X*0m{$qT@w( z%oM8XjQ#G|k(qdY_y)HGYTy17mfJf7iN4<9d z07z4{STYRtex_6_m!`@9)43|)r^5T)(QvkG=mVAjcZ(VFGDXYSb~Kd~$Ba!=)p;(8 zqVvoh#$cHKpk#i#Upmh0L;!`pO(cm;ejP=8lhK%rPln#_j=gob9#f!kWPDK+Nv2dn zuYwCV0=yRS0r!UMu~!&+Z>Q$q5fEAky{!};3)3a$S`u%IfTfBbAFMJ0{ugWnNGl+X zjR0u{q_Ghot$;K(0;Cm?#>W%z@=#O)^jVyy3eRT~`~@0JFtozFy!^A!_OtLst6#E=RYC`gkH2P4RHd7j?c;S?=~J-Ne%#hjOB#T z!Rq0S>wf&1U~mMm<8EV5YkRjw|FS0l_=%dBZ8J6pm`o|UeQp0-g%*aa=%VUj5o+&Fp2b7RL*o-y{-N~ppd>I(V({*BPzK_=S| qCqEn;0n!RcVK0CthkD=A46!okFq$F@d2V-p6qQ#u&x+s;YPc zWi8?J^9!5JH;O_Bd#N>!r+p^|0QF}ALW=;}YAsf)jszIHUEQgsTo?bw@Fc@?EG_B3 z-TtUv0D+{0;$#nX8`PNBWDq9E$y{0&2vk)ke!PCjUn1E7K1sNOQlp(j6845DJo7y6 zCfieE9PfDA-`;@~;^f)Jn@U1GTO=`X#}Z>h6bPr}mqmabFP#)|lHyqbfHB6&qw($I zox77GxX#_` zy;N0Iq15fMIh2^#FN^S{4ybFDp3jzH9nd+2oYb$Eg!1v!@w8XglJb7RE=RFGs|(j& z;!Xt`BAIx{UTPgkNbSc}EDD`da&ROKr9S`w002ovPDHLkV1kzK7l{A> literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ca342215e0feb28c10ccd969b2f744bbbb2f21 GIT binary patch literal 617 zcmV-v0+#)WP)K1Rq1H2wZ`du82JF8zD+=A5kQ}TPNl`;wsqL=Kh?y6KvqI&ut(QBHRe~=2@~XCm_Uv&0Cd)lo~3>-?UO^c0(_Ei zcBMu~fn@9*Q5GpE{in z%6n47x@ecJm|s+dYcKIA109hJd}Ob+jwGb^(=1k%F1i%&LD5ajNRLbJDN2c-%kP<6 zT29HxeZ8k5!VmqJn*&e(Kd=y(8w-KCu@IOWPfy?9Cql7jclx|dPhhDnDPCNIozd6`X z=ppCcd+|+SurT79vBKI?Zf9&+2}m6aYX75iKC-K$7q{#s*cTY`;(n$g*c<*T|hYM7+5k2gb<9LODX9Ctf~~QuD)S3x<-<4`@GLNW)F8OIRLQ#7U0w(fO@r#hQpN- zAWWy(%4)jv{C5N+(vJPoa^utVmNgPM2$qmfHqYv$Lc9wmA%R3@-8?Hm%9Z^7{7vyL zf)3D0LMvD(g)hS%0O0NY0n)Sj<5Efhb?sVmO4%{>eK+ZOsP*&B9`3exAcXVN9zK43 zkMjErDVDaA2qNsZw(pe~$gx0MC}jnQ$}dU)1-c2wlM=Z3iTR%e^0JxS-FQL>?H-Mn zpFfeCEYC7cqCzdLzKMT!^?@yJVshZan*jiDJnB;122nRL z!9OmmN?~w#406jo3WX4CQ!V>q-0xPEiW0ojA9HPB@Ba^U0@_9=plx&l+Q!}scmg80 Vkx_GD0dD{R002ovPDHLkV1kfLF@yjB literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..db0c15e25b9ea751eff9d0d1ed008c0c3a6bb57a GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@pZ zr;B4qMC;q>j(kl90`|}qU&$um z{35L5=r*-Ys^glw1(fV%_wL&H}#r*irRu+&WvQHTQeHW_V?u5UnmW}6p5@0 E03*MIF8}}l literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..42e13cb71543928af3bc322eb3d7066aacac2fe7 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@pn zr;B4qMC;q>hI~y1B5nVfCJQTd96e$%V@JtHhIB93F|ZljTfoOvc;Shulbp)? z=vyZFKlWcY^PRd?toYbtz7P6J2YNXQl$q{yFqngx#?_4tQ5C1Ii!p5LZCAQ}cav7v zYl)pFCX^@akA6^NXrUv_;4m$dVZ$*Q_bxZ*KzoyuS)W%2T+KC&QF5R2&S8~l(AwWW zMHJpQyl0Q+UTolYH!SNy2;T(#LXl$(adY=iO|`!#e>UTx#spTo=CaSP`C;B$xPS_UUi5|CN0R=t~AqS3j3^P6d$|r7h`8oT-6nmaza+(oAeBQr=D553=Z2@GahJpxMWd=$qCtreB*?j2cMR>PGa*|qoQ{NU~SwRB7F^QUg-zizaDb0s`@YC}z{&2{#I^)*7rk5{&iMEIH;J}{;esWcTB(@pr08$UHx3vIVCg!0IJP-U;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b0707bae362f0044b59a169c8a9e34ddbb591b61 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W@po zr;B4qMC;q>j^0d;5^eLRdUUA12ryz(RJ@X?fA_2W5AI)k?^$m-u6p70wk0e{ySbY# zJ8oHgU+MDmL*HfEB`fAvrc0=Ox_3Fv>K3ElQI;)+jJZAz(!v*xftgYI1&VVmtyz!%V%{N{_bP`;Q2{NV-`;#^UXaiFWIk_`vy8q ze6CpBnR(^F=NBI@IGo?9to^Uub6wc6&EY*fQKAB z7-2y~@w}jydRL^lcfD+(XK`r@J!B6GJqX!aO9R_NZ5QN)Mnv)wjG>018W27Y$;(dq zXZuaI$t!k#mq6ytd%xdrzWL_yzRw^cTxL9{n}BYF2IwZB8=(QZ3Ft;>fNlc1@jPeH z*w_RBkPrfn;}}5}*xlXkg_nO_HiQu5I1T_9+;v$70H9>jMpa4(A;@)S0-4YYu3kxC z;^riKd_Mn>B9?_@(nh%~$uupa+4Ro5&*1C?uU<(|+_o`%AfF~&P1H|wj;(PpY!d)f zrNn#h-$p+F6RJ|;k3TCc9xMY))1qe6Gv0me#;Id!l{&=|QPe7R#1hfIm~eEB^-`TC zZcbvT{;P2qy-xZ3LqseK4bMZf>9IJllHggB4MIEs#1c`X_>YO98kZ34hC@ut~|08SEQ z?*r7NK2Ul*jp9xbne6mH#Lq7kC}LS~-6$a8!J2>=bL^AW-6$7gr#JK*Q?}?N8ph)suK2Km@q%OefnHHuf-*vQG^A(Zs*! z`Z~-n6)2f(J$04r0N{(SbEHE5D9<3^?gRk<>Qgs}Y!7sc^os}3iGsP=tWn%4_Phqm zfO5Iz^6)`_zw<{iH=8w-2?`C*!&jeucq#|Qm5V@0kR$%nyWgH`5>&|!I9q%#c&3d| zdOUreTzW=vr-=QMM6FWCkH1#}-FxZJ1409I6VQ#&0Nn(1BQ!ua0o@1<&`m%$LIZRY z(2dXl-2`+aG(a~2-3Sc`GWh$Sf5UpIeqsCSe)${Jx4J-kVv5`LSwpp<%`K1#ECZBy z07xb;t^q!7Y!g_g!m9dm^bGzYp;oEWQ1p7IPRIrO74TPNcKL~;0d z3k}bM5Q2R#+W^OL(5l6yP91Z9Avf>@S==dhdJ|sF-iE(k$U)!;@KXqCoBQue^a15YZ{swHRs%R9%$sA@6? z>^3=-1CmLb4j*p~Oz;UH0LDo*z)a?CDwm~Em6Euva_l77@H{|Da@{H1Tm3E=<@3d< zq8ulM?MGY0efj|N6^K}t&L`dzxSZKJK>Z3)dInnkg%G7Kt{epF5BNVKJP^@MKsQ1I rbQ92x&;Z>8bR#rCHv!$a^alI~Mj9TKl7-M800000NkvXXu0mjf{XRs! literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..549c0a0fd375976e5cf57dede182a911d3023b8f GIT binary patch literal 1281 zcmV+c1^)VpP)b6wc6&EY*fQKAB z7-2y~@w}jydRL^lcfD+(XK`r@J!B6GJqX!aO9R_NZ5QN)Mnv)wjG>018W27Y$;(dq zXZuaI$t!k#mq6ytd%xdrzWL_yzRw^cTxL9{n}BYF2IwZB8=(QZ3Ft;>fNlc1@jPeH z*w_RBkPrfn;}}5}*xlXkg_nO_HiQu5I1T_9+;v$70H9>jMpa4(A;@)S0-4YYu3kxC z;^riKd_Mn>B9?_@(nh%~$uupa+4Ro5&*1C?uU<(|+_o`%AfF~&P1H|wj;(PpY!d)f zrNn#h-$p+F6RJ|;k3TCc9xMY))1qe6Gv0me#;Id!l{&=|QPe7R#1hfIm~eEB^-`TC zZcbvT{;P2qy-xZ3LqseK4bMZf>9IJllHggB4MIEs#1c`X_>YO98kZ34hC@ut~|08SEQ z?*r7NK2Ul*jp9xbne6mH#Lq7kC}LS~-6$a8!J2>=bL^AW-6$7gr#JK*Q?}?N8ph)suK2Km@q%OefnHHuf-*vQG^A(Zs*! z`Z~-n6)2f(J$04r0N{(SbEHE5D9<3^?gRk<>Qgs}Y!7sc^os}3iGsP=tWn%4_Phqm zfO5Iz^6)`_zw<{iH=8w-2?`C*!&jeucq#|Qm5V@0kR$%nyWgH`5>&|!I9q%#c&3d| zdOUreTzW=vr-=QMM6FWCkH1#}-FxZJ1409I6VQ#&0Nn(1BQ!ua0o@1<&`m%$LIZRY z(2dXl-2`+aG(a~2-3Sc`GWh$Sf5UpIeqsCSe)${Jx4J-kVv5`LSwpp<%`K1#ECZBy z07xb;t^q!7Y!g_g!m9dm^bGzYp;oEWQ1p7IPRIrO74TPNcKL~;0d z3k}bM5Q2R#+W^OL(5l6yP91Z9Avf>@S==dhdJ|sF-iE(k$U)!;@KXqCoBQue^a15YZ{swHRs%R9%$sA@6? z>^3=-1CmLb4j*p~Oz;UH0LDo*z)a?CDwm~Em6Euva_l77@H{|Da@{H1Tm3E=<@3d< zq8ulM?MGY0efj|N6^K}t&L`dzxSZKJK>Z3)dInnkg%G7Kt{epF5BNVKJP^@MKsQ1I rbQ92x&;Z>8bR#rCHv!$a^alI~Mj9TKl7-M800000NkvXXu0mjf{XRs! literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..622441755f94ddbf5e01835b3d4c346858da3278 GIT binary patch literal 1196 zcmV;d1XKHoP)H*VH#6@MAq2i;T(hl!ZBzul>z-+`scer@_(1>w zqEYt?%QQ|v7><>5oSOO+mfP)ai%#b!_(6a{l3>U=hMX6cZJdB8>LCmRFvb7?9;NUo z&Goia;vA<2Ap{t^g*g5jaUA2f)^$~OA$^U;0AQ?C6!p;QJOBX1aZEf)1;#GBblo=U zz5swB=V?G`x3_S3*e9+_#gm)2aO3AD?*H>IfRE(e`(p2~j4VJT2@_8c0HiSsJwY{o zGA{$h82-Hd4f@aj!n^m^P}F#!yfm00VQ+tTDGAbe0OZl5-$fV(7>zhaBaT6m0081R z#?euN*Dmn*k2?eamU+}t2qBC;(vU{ohvU>lqwWj&d2n!$em^U4O~zp|E}bWYfI81{ zYG~B`^eJkaaSs@B4gk`XA=B2&7q6rz%*EdRu6X(475pH8M=6G!!*!_`a;|z%io$On z05N$jP6$cg%7h32NOSifNwD?f4~U{3xw!a{ncMAdi~gIpnKb87N)$N&fa!UQU}YmD z6;{#{8FHQ)6-B*y+r`W{`L~KZ#_Pg(8oappfYbA_qRLv&7~@fzj+w$IF}Du=YE_dHNGVuHH^iy19B=Toh|VfHc;1|Gx%rx3^}F z{pH)6+H%)|0M+=>h%Xt9T(`x>FGNg38sFU5OpTYH&5g}V`Y)LV#%0eJ!1h2EoI_K3tcou5hUUVgim+OaI5D44+whN_A@Knl!!-DAE_8gGSw# zEizz?Aq)cyl0;0WMBR)~N{0wz3@2yDS|#y3m@1zm3jdN0sjGITx)P6{(;N@0000< KMNUMnLSTZ%rZrpu literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf71651883838976e75092fabbf85f8de5ce14b GIT binary patch literal 2647 zcmV-d3aIsoP)EaC}b(L%-;I-Ntje*L$pO~#Nv-51Lls?{swo4yZ35dbg%R7 z0!)5nWjA3w9)U3?o=WAwhEq0~?79V8QHpsKq3QeRcE97ijiD2OahC~#0PVJ)awl8F zF~$9RP2={maFxn|&UoS0KYjfvCX)#!lYbBd55>c~Lyjm}0x$q*`aY43mt)8ViJM}v zoEeG0jpgqFK&Nx4YfirP@8Z#uFY(KRhkTL<0EFQ=f*?Q;1ca{>SskbXFaS6?Jtj!p zUNYV&w$!yGj;Z+DCJ|)gMia2z?ElIs~#Hl7JmQpjr?CkdSsp~49_s=4}nAkb?mhe z81#o|`u>{nI?`Fl6QSsP@|v&#Tm;7Rgr@Hc5!A*a59oHEf*U`NB5u5OW~0usX)Npd zQiZ>~yuiEn7XXmAo(SG6N*R)Ea?l^5+kKj9D0=|mdumbRlK}x-Z&B*Z>1OiisJGTG z%lHDwwTo=?U_?!YbqP?-^YHHdJoUF{&wk9zH3}LHK$|?JaH}6fHsnVyU)|{aqPSHL z0It1&hlD!wGI&hqwXuPTZMQCfOE?dKeLyLIYXYuO3gDW6Ym@@GCg2)7C4gK;z>W!^!nBsCR*P*!*r`lV$E8tkY13ofJA{z^&ji&nnrXGz20JCdrdlFkRxSSi ziwDMI?vwyoB{5k9(`xbC59VfV^=$CAz=e^k#lX790I6!R5q3%d?$Yxp+E_r9!Na1+ z;muBkfDDr=u&!EcQ&8E9ZBT`-T3n>Ry$XR%0?VgMre0ta0*!hLje093Cn03*k%`>Y zvn&om#F!j5*`QGfRI45XfHv)9E|xQ~NQFkJ4+Nhm+G|4EjT|qLlGPlZ$4WCsZm2?D_Mb#a#v7H~)9B zoUL_~$1x8^9-!M(JDtOn@%#un@dPU(8Cbikz{j`=XBEbYkldjZ&jbJ`n0pRy1CzT7 ze8!u;FSfuUXNrZt1!R}w1m$!1Uhk-A*XZ?*kawo9-W@2q1p-_C7T8DZ?APG`g;D_5 z1YDyOz%>Ea_~-@r58k%gWKG59hX4Qo07*qoM6N<$g2yH*SlUI0z_n{%8eZzLPnH+} z@bu{u6n35f01bfjMu%9ImQlluoTpEX<fal$R*1E`CCWiGwnPdz%b8akF+`L*!IG2kH7E)xSj^}vqG~4P^X~x_HLc7D*{N? zN1YF75YiF}`Y{^_u%^)34s6$N!~Vef6^diCi+UU zZ&q7YgXDxrJL7*f2r-RpF(XYU6$qoIS)kudo^n*TV*;ec zVYMz@!YFQEj4BP)FD$j2f2eZ4ZPRxqjNc^uHQqnDfq0yUAPBS!**_$3dM=;| zG-nm$(3`E+r-3a3-r#nb5X&MG3Lv+3i|)!U-%V2zzWw4C0D$nJsHX2bU7YA(IIF-G z?`gVw zG^k&g0nVa9TS-x3#QK%P3IJ>sD~N;w=n_Wp(wRTfa|9ul#rX^8FgH8T6lGbdRAh#H zzqOsSoiz3Pdz6nq{)nDcAa#?!>sJm#9gSAADXJ5&w`ppJbXz@uL{_BY_=ykDC5+L(PAoZ`TENeDvnk~i-IxVi*hd+DvwCjq_o;?k#J^fY> zUZ`Q&11!!1&>o=5#vJsn2wfCe{a~Y0zZwHj?|QklTL{0_+DTBi$gSN%oVB0*F+)p3 zAjrk2=Y1ZCgaTGaV{GAt-x+F|056{av-1qh&a-ytV+%xHtIKbo1p;b?H30RfO!WhW zgZS~Jg2s<1NJL0<{{gJe21X(yZ`uF=002ovPDHLk FV1g>m-R1xQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/meta.json new file mode 100644 index 0000000000..d80c443a26 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..970887ac543f554eee18ba9a49a5d4ab39bf0921 GIT binary patch literal 637 zcmV-@0)qXCP)dmt} z4Zvx;o#)^5uYpv`e6QQn`I|B?kWZmO5UC5#S*T#-Ba@l<@b)DDlQ5vHS5KJHwj0QJ z%#n(?cYAmp7l2?Gs&l`$6A_I$0;=VDOAAiI0DzY3F$n_(K}0_(FY9MB@xpT$1gT`_ z)m5G!48y$rbwyT9A*F*WV-Q5>5i)}ch9NioYXKRYJN9z6|_)gtTp#>oA^}_ca zYtXmTIx?B@)PIpnWFq<2ylmH6IRd)3HFLoOh)@(H*FFRKiLTQiPJ3GccpW#F8A++P z;77M#vF<-{c950sK-+Nc_tZ$r!q%IO1{fl1uYv!Cv6d91XN#6GM`XU<-Uw)tI9e%U zSxu(X+gxPt1Tx#+RYd~XJ%}rz56fGjm3*E*7`@+Hh57YuxQwvnh!3+EW XRK^}3VNlF~00000NkvXXu0mjfzhxkz literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3cdb2b3dc1eca5a5510c7a0c542a86ddc23ec471 GIT binary patch literal 489 zcmVEJD$4xv`GBEsj$Eeo<0Ng)? zFersJ81N-yNaCo7qq?!Rv#x3WNnAE4jfj1&*RKQ+X5jAftf7g96q{20WWjLL2hcY# zS^O^2?pZsF-xbkFVZikw?%3N$()A*+BqevZR{(%j;FS{PkT@*LCe`2v(^?Em(xQAm zx+v9EXP~JMk-~su8|YZ})Z84$%O#`dkhXoiIMz5{Ynh;U^q43vld$lL(PAnN^KsL&NY?J}n fC2#dq1GrED3nm>$wM#w zZ&UD;O9%uiRFaf{)j;#1o3Nz88m!RiAsM44(V5wIcQpFDsx!~~IP=cOI|gG6)6AT1 z0lJxb1D=U~F_T??^s{r@=JUu{Fip3bh9c6}Uiq7Fd%^~cz*sO%Uy{j!X=2fe0{~9z z4cF~S8NfRp%&Dtd#a=!+x=DUIUX zwn>s7hinQ&oD%?Gu;K<)n}f6tN(=~)wn;h#VpjB4Bt5Nz5{p?;@^(oK;NmXo4ua{t zCnF%3&KnnXr*9uXfolVT&Jlb6;hm?!cl%1`jk!hz0LVs~D+4m~ZC3d55!Kq6=fQJQ zOJM+X(@i-EX6D;$CA)%3xq?=7*_YtU+gr>G1@N!aK*Vtnv!Z}=#N70+Gy;Oo5v$hD zP$^fi_xnX(=f&bC%G+D2dc-x{j<{4ZfuM7wJQAc0XdRSTDwzO)d%^pF(J;byTB6HF zwRVP7GNC*jqzvHMes^czw_!g>oL%AK=Z`y0(Pd+IXJ0udNEzVuQa1`S6kw^PFw9W@ zW{5A5D*FT}19S$@sUBa!%5B`!z)g_F5WN)5WY@>y#K%{HhfLrUi<`pjP26eF3u7{2;sWiF^f`xDi0j%mCd2bTczR zw*cMD4A3n=H^PS@PNDGGBPr_09DW9odLO`R^SSJr)+6yl^y+KWe+lc8+6hwM$y1}E zPdEpRbKrowzNt@wGXr!Bpuo+_B$Whj-vW(oKH&Of5FP=ogOYUPe&Tsy#EaTI6>i=R z2pb?$oA>H*#4s}R?e5zIPxk@AbRN7m|KR5?3Y4nw3Uw-(=zBXLgH#esErrp-{TG@m z&#$`$(~1udr2wF?8tInji-(uSq80DzlR?;k-r9UGJoswu43)nxeK{jUoD){9T>}7$ zhnL1MeWP%-4=Aig7y#dc=X0J1?*{>dWZsZlAZW!|&-6LHItv zdKH8j3NX9bLF~<2ZO7q=bHaLq2W|}L)mQ)164oa?0v@Z)`^{kR994Z%IpDF{{J5Z^ zPuKt}w_(`Ljwcmb3RLw;?E`pi{_EZ$0HED&%KY4ORNf8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..6bbc3c9710a1841339ee648597e8e375a2e8d789 GIT binary patch literal 1037 zcmV+o1oHcdP)2#dq1GrED3nm>$wM#w zZ&UD;O9%uiRFaf{)j;#1o3Nz88m!RiAsM44(V5wIcQpFDsx!~~IP=cOI|gG6)6AT1 z0lJxb1D=U~F_T??^s{r@=JUu{Fip3bh9c6}Uiq7Fd%^~cz*sO%Uy{j!X=2fe0{~9z z4cF~S8NfRp%&Dtd#a=!+x=DUIUX zwn>s7hinQ&oD%?Gu;K<)n}f6tN(=~)wn;h#VpjB4Bt5Nz5{p?;@^(oK;NmXo4ua{t zCnF%3&KnnXr*9uXfolVT&Jlb6;hm?!cl%1`jk!hz0LVs~D+4m~ZC3d55!Kq6=fQJQ zOJM+X(@i-EX6D;$CA)%3xq?=7*_YtU+gr>G1@N!aK*Vtnv!Z}=#N70+Gy;Oo5v$hD zP$^fi_xnX(=f&bC%G+D2dc-x{j<{4ZfuM7wJQAc0XdRSTDwzO)d%^pF(J;byTB6HF zwRVP7GNC*jqzvHMes^czw_!g>oL%AK=Z`y0(Pd+IXJ0udNEzVuQa1`S6kw^PFw9W@ zW{5A5D*FT}19S$@sUBa!%5B`!z)g_F5WN)5WY@>y#K%{HhfLrUi<`pjP26eF3u7{2;sWiF^f`xDi0j%mCd2bTczR zw*cMD4A3n=H^PS@PNDGGBPr_09DW9odLO`R^SSJr)+6yl^y+KWe+lc8+6hwM$y1}E zPdEpRbKrowzNt@wGXr!Bpuo+_B$Whj-vW(oKH&Of5FP=ogOYUPe&Tsy#EaTI6>i=R z2pb?$oA>H*#4s}R?e5zIPxk@AbRN7m|KR5?3Y4nw3Uw-(=zBXLgH#esErrp-{TG@m z&#$`$(~1udr2wF?8tInji-(uSq80DzlR?;k-r9UGJoswu43)nxeK{jUoD){9T>}7$ zhnL1MeWP%-4=Aig7y#dc=X0J1?*{>dWZsZlAZW!|&-6LHItv zdKH8j3NX9bLF~<2ZO7q=bHaLq2W|}L)mQ)164oa?0v@Z)`^{kR994Z%IpDF{{J5Z^ zPuKt}w_(`Ljwcmb3RLw;?E`pi{_EZ$0HED&%KY4ORNf8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..251714c830f1e808bbb2b679dc7cb5c1f2ffaeba GIT binary patch literal 1117 zcmV-j1fu(iP)~yH8<_yI3CKn!fNTP?kqIE1fNXr?{lI3uocNye ztHIRR_rq=Xx<9b6yPXFBI=&|CyH@A^T|61M3-J5)nHJSmV%iP>V2D-sJ2jWbMzQGr zzQ1b5er|tYQ2;P)2j=ZFJ*upesC(joy8vUbW2RUnzg7=JM*ZTLwu7STipeE-K!5;6 zb#;`k0}B8!wBy~kSI-_jnh1l8y?|E)0HYp&{pZIbq(_FgH~5~tz#>?5FR=8x!KD{K)Mh9( z%qzJ#<+1b`kO?50fNZ2b2e7)-wF0`vi#zVEW%f6UQozZ{3D%x_!uUwdfM&f6T`Ty4 zKffA)5CTF7-rg)+Uj7uyL8<_YHZeSqdIpzgi-_d42Uv0ymcQo^QVmu(Fb^ge|>#PH4C_BK$1zU)wvJt zt!_SWoV^IMqFI{;6-aDq;H4A z%HZ_$%nkmg+d;El#+@@URi8`~_HcAuzNdyhHntJNT>#d;HX7ez-xIb1Xr*$jGB8LU z$6M3mV>dZc1YsF4>u_`40Y-2MC4~5v&{-J!2R_6#Qn?GDt$n5d$Z%-6^TAWZdjTv1 z4)l7+6QkQ;gM>Ora!Pa!h;68FUj-Ji#lw)KLo`To6NS3~ zeUB{;P9n?!4NjCvMG#_-zsD92Lqs1y)m$EmQkW7U354tglG@^7hzj0oq3c?KYSaSz z0Pwy~G@olyVlk1(77rpSc%Bxz$lYKpTRaGF@CSMwic)~0xO;^u3mpr-Kaf@{Os=~< zTGOj|cr@sjjm=QfH{FhV&GrQ2_k?igOa;#cX`Tm6+2XTsdU`fBCL(x1fIa@d;X|AV j$wVfAYyz^e^aA_?%BG+1JNLM`00000NkvXXu0mjf_NV;| literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b39e3f70366990363f6034cc9566acf45982f8ad GIT binary patch literal 1075 zcmV-31kC%1P)nNQGytLv5KS5Y(FTYn4S;9^M3V+Uv;m?ayuoj$CEr-1 z)q^hO@cCr-)s2cnw{O$Kk^%sv+qW_O3;_84tMB_g+Xq>g0gYDA{i{p4wcR=SdG|yu zXN+#&Mz?QAvNQ9sa>^ODJQp`KbyXW*8v=j=faQ!)kh7kHd>U32GIUn-!B}oMWnmxeDfM&Bv<-7uCWaHrI821jy z^a6nwSx0UjK%J2dIj;Z!4ax#f0NQ4U9vmIR8QG|xDA*bPegjiq2aQgAU=u0l71}mC zzTdee@HiOKs!>7P?4W)!sr!2e!awKD;v*56#xaHe6J1FWJ3xZ1qfa^Q}^2f3u=M|jo3$Qpr zW>g)7P0j^LTLa*8z7oA0HO^LO&S2v28d?s1Hj!ATn1ZXU)0J7BSP?m zmUSU=2FyNS%s*^wB9SvdmvR{Vdk#FlOlVm*VwHd{|fk z6$tA5S67z-P6e|}s!y6wB{2J1Ow`VQYqnM}&o9*{O{ff*t-JZoFG(slEj7LD?!2zT zyj0If>V2iy4@1oPAo=-he-f-!IyFzK*QK1h5KDsC&jN;~(lGLKT$V}oNxiKWYbiV> zl>8irx0LEv+7AdLKS$-QrTWG8f1TZO(g27yKr~w)fd6sR^7Ye3gAxD$002ovPDHLkV1hi<-W>n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/meta.json new file mode 100644 index 0000000000..28092aa71d --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..6a10aa1a5787ae9bed80e578fec7b820df82fde4 GIT binary patch literal 626 zcmV-&0*(ENP)p%!HR+w@6*O;RunX(k(3g~%p0~f0<3p! z^e*Ro5L*&iM7BX8>d`iwi$YF7>@LJQtyxc!;o)}p0|4usatpUgp(L^;k+_ zKmGP4*mRjIiH1|tBRUf4=dX|V_rHtQFh*zH2O>3KjK{gv2snTzZ!49FK80Gv0)+jEP)v)S++aNctd<7U8FkeY@=p;sp95C23^PZoLu-4*##<#TzJc>=g+SmlFjZMJX_-6v7 z%k6v?nm|KXl!NGiO#i z6FmW~&8T)nDJ1|PO;cM(N7RI@6Ig1E^Z6Bd&M24#0Q>p%(OP&>M6+wQFG@0cNg}fc-r^CTG&1**TyDbZEOP8#$Q~V VTXrDt3#kAA002ovPDHLkV1iig9ghG2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/meta.json new file mode 100644 index 0000000000..61b332611e --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..0b59af3e03cdf51ab99c3e5826d0f84558170885 GIT binary patch literal 1142 zcmV-+1d02JP)be%?OQ(Oj-2dOS z44{42g=JaN435nJ9$VYxiJvzb`?OTri1cKl&}i%fgrHQ~K&@J*Tia#sZ`G=GVVlx2 zpii~eQ?XtFL7_n_i ztpW3eJP!8aKNTJadv(e(fMJ?bBEZ33oz55X_}x9j`X+x}#$|oed*a~&=s5A0T%;n% z3a|QVBlHx35hAUIxaob1eaWef~&~I|S{+Hii!#UkJX@*iWPgGP^xO zg0 zKav1x2M>6GZ*7;gTD4Ahc0Opcy3XAJmp34KErfFPS1~X?r z=|Jcw<*_<9q{X!&0AP@Rq&W_ue;pEJtjGi_@%07*qo IM6N<$f)i*CmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..0b59af3e03cdf51ab99c3e5826d0f84558170885 GIT binary patch literal 1142 zcmV-+1d02JP)be%?OQ(Oj-2dOS z44{42g=JaN435nJ9$VYxiJvzb`?OTri1cKl&}i%fgrHQ~K&@J*Tia#sZ`G=GVVlx2 zpii~eQ?XtFL7_n_i ztpW3eJP!8aKNTJadv(e(fMJ?bBEZ33oz55X_}x9j`X+x}#$|oed*a~&=s5A0T%;n% z3a|QVBlHx35hAUIxaob1eaWef~&~I|S{+Hii!#UkJX@*iWPgGP^xO zg0 zKav1x2M>6GZ*7;gTD4Ahc0Opcy3XAJmp34KErfFPS1~X?r z=|Jcw<*_<9q{X!&0AP@Rq&W_ue;pEJtjGi_@%07*qo IM6N<$f)i*CmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..741bd3ab556f0c30be696b5609474b6c421b613a GIT binary patch literal 1250 zcmV<81ReW{P)?P#ddqW?PiMr>@6FPQz%T~YnWm^3?=J>($V4_Ru2$tQ4}@vG((Pt!?f0T%lIL* z0HHAw5L$rH7zqe1Kxm8vgccw)Mgl?$5E>%^p#=zyk$}(wgvL9cgE7W>-8Y{lh4Wk~ z^Ir&2xF)64Q_cZ^)nc>FEIMJ`%Ad$~f_DpuqKTez&H(6KDSY_w z3;86&$&UfB3JcIDk{AGedz)gtTrr@qDrf+#&h+<(E#mn9YsaIi>}SKf1(0yGM6H)A zGG~pGC7cvBu-c6B&(ELf9zyFpLT=Cnmk5MNNV62$B0 z0;0Zevy5+ofRJ#}?ak){Mgl?$5E>%^p#=zyk$}(wgvKDDu-4inE(mrqvkr00ouffo z^RKUNIt5aLSU?};f!BmaIb~i2JK)(LwodmD26q8hhSnNUG(i+ioI>4J(4an!I@rQD9aa6xZKQk@O>lSjzH*$Of4p|qZ4e76=K$+a zWg+{+)>wjT&hO8E+|?Rn6=+LSQ~Ih-IU<`;cS)#kU_WSP!%#)p{@1+uiJ9W#k#ysf+t}#2^hy5^I3AnfQO`K z`K^`r5UEcq`(6n!>wVAKfU0kX3X9M}2(yc1#~8U|?SKuh1W@sU5CZGv3X8`F0O(U7 zQMU}5?Q>GzE|{P`_V#%jyvG4l8$cugDAe@0jM1b#0JdJPw52?w=k|f`I6%|3xRer$ z#|Kl><5(cksyqO_czl3eIs+8^pP_@bd7lJxrC6?%rrH2<15-PM`bn_ro55N>S0X{sBx&wJyNp|EppKpR?W2fhk}6-YGH1{l=&|0Qb& zhAfa^R3KHCoUp(9tzUEBB?>3JhQi+?-u%A6NI+--LSrN#v;d*;AI9E0sIeh7?f?J) M07*qoM6N<$f}Qp>Z~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a6ac8e6d65a410a81a2714f26a74b6a51595a095 GIT binary patch literal 1475 zcmai!YdF&j0LK5D+c;vDBexp4?i{xfA(y!oJM6e58Zx&Y%zZ?eVyx-#jMIe95TRU> z(86Mx%P?e;yU6V!cXC3aqi^SV&WH2i{k`Ac=Y8LMj+jd)L}Wz(061Z1YwdjOs2_p| z9{W0;369(j$bjvXjzLayXHXF887qf)(lqhCl3 zlKX|1oeKPPyOAx;dfbV4bwS2M-#RaWKT+Iw@qnY`;FFo&`)NbUIzVpU5m@sv6db6) zRzYQK%cphZHF7hy^BSM5CF31jOMC0IU?B^YXniUHr5vcp&xd;k0NFh-njOYtFOi=P zc!~SkAcqE5Doqzkv&OGIFlbN?c~yylg=}EBZVxP7%T39UJ4ajeL$wvc+mb9SI_On9 zlX&HJqXsB(-xfE|*qXJ_e`pSf=!^D?Q5aRCexg{ssF2^@V*%4$qYmCKa4xLVIO?G- zZ_#rjtF^E1k`?&S{Hk8Dc-z>)IUiSqVAE_`W{rz39e zTEEq*o_yOUHHwHSGy$>$CUe8PSn^^VX)#WhE|sS_XpnQEe{fJ~9X{M}$GyIpTbo|o zZ&XaYemkDhtvuZmo_GrU658sIDfxy^c_I$|tR?JFLj1aOz&3On9rYx=((covCzz!| zvLHzA&JFZhfQ!V`DCFk%O^v|nSf8w#fyK%6ni-|14nY$lM5!Xi-2h=`f8zj+(|8Z zZ@2SE^tkv_l~m`)639}83fO08*89#8Vvnw7lURKwkOswS9xYBsFsS2l->?e4tHH>R zp-T-zvzRhpAcxFUVL{1JII2WGuym58?-C>(?YN9k8S5f}nRYr`Hd(GR%et_EH8zwJzh_BvR zSP;^XB4|s587vVp%~D{6UbN!HFUxbOKL;Gh?Ibge*STM}lN{A#=lSVPE9(8n5x*=v z$b*l1+Fv^p^*dW=BFa}nR>1uc!GDZJibf=jV_56>)tPqEZUHz#T9L@5Tu*ko30x%w zMA@Uu$M?P6CrN#RBcr`QITYpoPSJ@9iMi# zg=U~(LfrC3EV;&5G#H_h0-d^Y7@;#vUt7kVeWa3-c_v@@zEXv_YVQb1u&|qGB>=+N zv+VYne)5t*mh}^KXP-*)hcSvcd7}V~2*0Gnq~Ith=6NVh1pZlrH%<{x*)1S#P?H=s z@m31ZB|b}MN37y=Dlz={ Ol>s{&jP-L%9O)m4G_i#M literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/meta.json new file mode 100644 index 0000000000..23634ed980 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..620fc3babb068e59a6dffd6ebb16d121308bed2a GIT binary patch literal 706 zcmV;z0zLhSP)i7*HnDu$>MLJSOSo%%O- z>(HT6RaFcWQBZK?IF70`u0x1YxDL)4Cn2b6Tr4F27W+ZXZwt zu&Uj`jUP4^3R45Fd&qUI$DDS@?R@xLX?^|vfkq?x0GpO2w>C`pk0231QP0Vpa%kwn z2|>JIKz=oX5&K4NxOL5e1>o$`l_k?6_~naP%yzq-=>R+B0xwJD z@LqK~J}Z_5KxMBg0oq^QbK&@S!2nf4@pM{T&?jDE6pQLA0WQCv&jj)yz=h-A8wY;O zn{;vmI<`F$&>8+6fZg3)nqkTaw-rc0xUGPGKj8T2P@bQj0MPP0jAD_pSyG{ifkXga zFo2l3gLiKMxQYQ>**5(!twj6xt-KwYA0KpU!=zSs#qrT00I#=A+TAp^REcLJbRcR4;fj^1P|V{!kH%q|e0T0GpP@ z=dWi|O^kym2w(!_(OD=78EfYFLN-!E082|N0Bpai03&H5Rk5pCi(zU#HvK002ddS5 znvDk6H@$xzLtidPAP%9@if*?v0g@eoPWTUk(@2CjrRkbu?`*vGImd2E~&U o@l)&BZ>KYWw3Pv*t!EGL2MNz2V8E)zHvj+t07*qoM6N<$g7NP(`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eec97f94a87188246941a8fd78822ad3ddef3de1 GIT binary patch literal 566 zcmV-60?GY}P)YnnwirLWLcAGhm1 zL>Gm`w3uRnLfyyTy>#JmeSaS+AtJ!R>RyG_|Bb~#VARV@IP}TJHWnF0t5V&G^<+>BIIjI-ebNNrY%thtavT~uoSP=E zFD?PlPrG{w?4ni}C!=8+XlnZaxFSO9q;qe(ssbb<093GjCM%JL&d9>gEGrkV=Qn$W zES|ttfzhx@`)rtwvq{^hWtsqVE-n**<>yaKZ68-eWKXDgof^8q%(4LZcKro_uaimX z*#8x+u5A~X+WsauaC_3nQzN`TVKO{>(}nSP%uU*T#TO!J8iq1oY-Hw(t3%}8NiN`u z2nyleeRvO$cQYG@BBE!g$}&Dm){cWOMBd$p5Bt!BKf}M~l=~*8Fj=i1e&-HyRdx}E;yA zq%dv}F~7fmV)VyRsz0%0DgoJ40m_zcHfz0yLSXJ&u98!vvILe!b>@4GX< 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 Ye|ft7>dQ93>Hq)$07*qoM6N<$f|X=F$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/meta.json new file mode 100644 index 0000000000..9bdea8d52c --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..8865a5b24cb0dfa2bd26238a3a7551f51c6ac0e1 GIT binary patch literal 526 zcmV+p0`dKcP)rs+wx?4YTANuA;#6Y{&X=H;K~dD6yOLI_+lH@XE}iZP%YV?Z~?fNqQd-CVta z+e;?9!~4I|ag;m95izBR*6&ue&${GWsNL>i985$^Y2LH?6L>?n)+ra0*qv^pP}Teafsioad+L<-{dk%^SO5e7 z_yCq)>anV{V@knOh7PuH>=r2BUDwevzo&c)(HS&~RgoL;y)OE$*ErAzkVHiET@Oh_ za#6tPDe{!Tv0L!HEq%9g-HHHE zz6A)&uhq7cFO~C~IC=_6p>h!)hes)i2v!Rw#=!(JrFb5}di{WS9@SF<0E~8Nzb!rm z<=cbsLj67J`M((m34^Z?FALA711ls<0OegeNqm9%bkH~^Bn&A(M}FZLeRO-J^Hd6V z?AB3HD~^0#V4s&>L%pM9*{1aSqW^*az}0_B7z4U726ST#=*Ae(jWM8`A9F3+>AiZ% Q=>Px#07*qoM6N<$g5AyRg8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ea0c9419424ea306b510493da9525e9546a7ab73 GIT binary patch literal 527 zcmV+q0`UEbP)KdSWBFDydBfU z0C;`<-7(Qr;4Zs5Sh$=eHZL^u#gf~bY%u@j?lV%(0m$?3tk#=Rp}zfNI1_E!SIEkl zKT804p#j9Vub(V{1nz79+SPi)YQ5=)X+V@~yD|FXdx%I2@kE_Els!80&;h@H4T`8ME7 z`RJ;FF~hRQYuAewRjSV z&8!||2_TEd&rt@eOuZA{I&+IRX2(EYXm?FI;$4t5jznJQ!7J+!@$Zqw(cXQP8K3J^ zpr3J1@XkSt81YbPYruluo8^DSQQv|8fs_B0m<)twG7y@{Kxifdp_vSX<_{wF*JE_Y ReXjrj002ovPDHLkV1k6P^L79L literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/meta.json new file mode 100644 index 0000000000..dcf8d47be6 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..bca65aee8babe9d82d27152afe42e14b90cd966e GIT binary patch literal 1069 zcmV+|1k(G7P)1& zo?8Ne9AXV6WV>E8t{YiIY$dTcJ#0rzqB1ki>}umXuKMl!-hSWg%)F6MO7W7hkv4&} z@!|z|#rws#$M0r-b{B@Mk4WCK7UeV-Jol|h}gq}Bp%c0m35008jix~n~ThMPYbng`(fb#%=l$zed9y&a(5qOuP` zxB`r*8Q&DiCJzAR<0IUK;dmb4J!}%c-h#8YBi#-{01RV}fu@kuRs2JcHlpVcL|Ni69Cg0n$!> zRB%byAI@BK$?#jLX0;EkKZL9@In?TxF3y?N}w81Tah~>OW5IP^gy!n52_|jqW>;Ug? zgl2-Oy?NDO{6xUr0y?~Tm5}AfEr1SZRwZQlaSNcsn^y^0elNZPxCcR}v`t1si!SQ` zD9ew#0y^#Gefj{YC3#L@mP0*_9}fucKSm1nE()|q!~Sr*Kc5DSs7aqDU#ng`;urk- z&CQR$1!!-oH=i_SIl!{~gx&&vqX)ZuvXq-4fE+(=0qpV#3Hw6?m*1B1UskgGgm#3O zH~+bI4FI^m?~D9gJ7mrda96;xK6wUNe%t~q^IiZT&rhfY!u}9Y=*_E!3_tF9!2gQ1 nGn6)gw6PW-Z31cI#S8Ek*R0$!_8gO|00000NkvXXu0mjftP$uG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..bca65aee8babe9d82d27152afe42e14b90cd966e GIT binary patch literal 1069 zcmV+|1k(G7P)1& zo?8Ne9AXV6WV>E8t{YiIY$dTcJ#0rzqB1ki>}umXuKMl!-hSWg%)F6MO7W7hkv4&} z@!|z|#rws#$M0r-b{B@Mk4WCK7UeV-Jol|h}gq}Bp%c0m35008jix~n~ThMPYbng`(fb#%=l$zed9y&a(5qOuP` zxB`r*8Q&DiCJzAR<0IUK;dmb4J!}%c-h#8YBi#-{01RV}fu@kuRs2JcHlpVcL|Ni69Cg0n$!> zRB%byAI@BK$?#jLX0;EkKZL9@In?TxF3y?N}w81Tah~>OW5IP^gy!n52_|jqW>;Ug? zgl2-Oy?NDO{6xUr0y?~Tm5}AfEr1SZRwZQlaSNcsn^y^0elNZPxCcR}v`t1si!SQ` zD9ew#0y^#Gefj{YC3#L@mP0*_9}fucKSm1nE()|q!~Sr*Kc5DSs7aqDU#ng`;urk- z&CQR$1!!-oH=i_SIl!{~gx&&vqX)ZuvXq-4fE+(=0qpV#3Hw6?m*1B1UskgGgm#3O zH~+bI4FI^m?~D9gJ7mrda96;xK6wUNe%t~q^IiZT&rhfY!u}9Y=*_E!3_tF9!2gQ1 nGn6)gw6PW-Z31cI#S8Ek*R0$!_8gO|00000NkvXXu0mjftP$uG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..20635e8ab9aa9d04eeb2e23749a252df9994b4ea GIT binary patch literal 1274 zcma)+{X5eM0KmUv+PsX>^0H@6V~hw%4tbdw#^Yr(X_ShdlACI_XwBBf#_nhrp;lhb z%j|9|swXAYBxljNT4jnBP985!q{EGP>h$CNc0YVRpa0j;@?m;wWSK^cf$ZzRu$F zA{eiZKD{R=b|7lr}xe?{n>Z?zPCO zBnNz-dk6?N9FL)7JMGr-UUG~1Ngdv+c=U#4Z9D`Rs_|dqRxERw18ptn+vY3mF$ln- z*hJk9yip)jD|gRC2y)&v>dTCVi{Kz!$-)j9B2!E`1T%)no;*YTYD+0`1+f)wYyBy6KXS%j=;QfOi~& zl~*z`eLpDH&{7UN!M3@}B~VSURgZ$SnQr9=KYNzVY7gBqJLjg7xOmY=cBS+=gBy=s zY`^bf+Oc^na<n8T53rPq1 zsJ?oP+C20wl!GjU8{naxTxJe)k*t8l7_+i0oeVleU5&F|j&VE^hJod?Ly*bFK)2e} zI$x0B6r~965aHUCs(dc0WuAXp$PmyihA<4mM2OqswD>E*9-g+I?e}ERRG5#uhfiZ+6xfrek3Bl5_x165A z!TXxU3wc0)>j^V~sN;*ow=Ovf5d$1HyK_h6W|Hpmx^xq~yyx{UZ|imvzOO`z>_Ts< zA;a^6Fxkh?w`(Xxd_*p**72?WX|oKg=kFCS#;O^ShSa>O_YneqN4n2kz~&5EzI-0t zgm|{3t zJIigoWXs%rQ0MyeD(VHt2gk2J9O*oON=^Kk7AR5er1%&#EP)eioRAp`Sx^YLcpoA)4$G5pLp zQ0;(f>z&eVtDtD-fz1)XjJApA5LT-ooC1y!ZHGw z(KZpz0-U*hAQf79aP$@&y#>!szV#+Z_}A`>e_1#SV6;sjgM{=DU}tV0FV9Z^5Fgt$ zIp~jHA+9=gfv+^PrN1Khi=0p@T^+;-U{~HHCY18!ukc&n1YPf}jeoxWHUI*Ew6Va1 zQe1hLfFu$)0qn%F@iz8xdm7E&uCY7Mnj*n9qQ2ao0^bIYIB{$sMZy7u&i6HnVI(Fh zy?N0A*O2RhCL>`u3UGT0yp8=e5)Mur8{YJ1|2CM7^zJ5n6h5H(6XMpoy_bi6JQ%kBa|qVv0q02O#YO1{{)vA^05A6r&pQux`h&j_h_=+k1A6cLj! zGVwL=r||4fd_3=(wffR{1Z2(HJ~46LP5yw@wwfR7gpvrz!cvJgh97PY@QI0mKaG=_ zz)DK*BE{A?0qHzJ8vZyMBFlYz?)_EKI00GNCEj`4S(n?pBBF5uZZ3|b=VciqJ{)$L zT-|CC4|Dr@H`9RcDpR&^r+tioQzd_INE z0@y6r`5aI>0vx@C@%(+`^{p+vv0?btTK3d==TwRuL2?V1sd@>m8m}&P}J6mAa`9 zHkfMw{(MSwy;GZPE+vF4Lz9MmUI7xQEOp~*bq%%>sI(X0g~z-qtW4^bK)PC8#nu{1 z6X4mMSf;uL7_T4;4kk$0R_ZP*Rg4o1L?X$vI|=($Wpg0{GQx_SxqZ^cBDV?)L^Jaz z?|P%7;&YBID^abU&!@ySR;9Z#wz5!pJIo`1S7BuZNZI{4SgTgcKC>xkD-)Fo;F6Sv z3o;x9=xbC;0$-O4==`;6H4PU;Y*)foE^0}N@-NAr78ZG0024|X9}Zl}-CP_MQf|Cj z9T~RBgaEe}N!3@>RuPo04*%cq!)1k=#-0Gx4yeYS0M!nt#(!39X76S)Jahm6002ov JPDHLkV1j7Eg;)Rp literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/meta.json new file mode 100644 index 0000000000..73c7866c3f --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff005e8cf53fd4a19c616a1170d76fb41d2fdf1 GIT binary patch literal 616 zcmV-u0+;=XP) zx9ex{6R5BonIH&rdZQpzs)LYY+ifi&Fg1naMVHu@XuC}agFH7mFUk4;o|AAOijuzImAH8O6e6j<)3>h8axt3;;3AuxgqB2!RU7 zLC^kcv9{$XXPWQ4Fcu8jR+~P^Q;W$9E%);;5L+ z=0@S$mP6O|z;do6Fix#no(YEKurV1v_yosM{l>rEfQ*h7n;U-K4O2L-%Omd;fIBPcKLXRVLw309dOUtmQN+QK^aDOWIFkOt0QLIA zg~MNjr?-|v$CZkq%dium>v}=o(2_G@#4s}vd?UN`Ujt90{s0op^De*sX#KZzo6AMI5ED$xZK-9znQS%$|m&p*NpVM*x0000=G`P)q$gGR9J=Wm%)qEKop0+X`3y@5G<~Z>0UIjtcUGF(_>-RtAF@{ z7Zt=yDMT;LY-?&u2$VJG>>*7|O&443GA!gfCG%$9`~4m>10$4DJZ5UT1^h3S0o_yv zbW<77O=UngkKTYdI(mX-nx(+E`OU$LJ%9E>*^a|hN&wLxc>kO$2&9@yiRjtZ&WmKy zQnup&FqM-2z~l7vRURLYzX0&@{RfKkGNL%fGEJg5=IwbKfa|XbjlNi z{=jX9`G1BB{JK5HZH54hJ};oqjEn}L{&Zi&pF{w{>%Ue2%UM9jG}avpVIG#cw+qWz z0Kj;>pw_PAZmBz7q_K?tz!SweQz>bfzq-2I zx-j2DSx4?86A!RRYFu0l2?9wi^u=iLQxz|Q{=my)e^Xu*xi4>yoA;lAZ5^4#2_4fA zmT9U?piEi{Vxl+((oXFv{t$?sZI#YIzD?G2OrsyyU26S@=kP5;C=p@3I00000NkvXX Hu0mjfTpR-v literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/meta.json new file mode 100644 index 0000000000..e61affbe37 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/scope.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi/scope.png new file mode 100644 index 0000000000000000000000000000000000000000..437ebf2f00756fdb18f45fe004d0368c696c1c5a GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<5> zr;B4qMC;pYySbPQMOq$OChfe@ab)uL4}axV|H?JrIPq;`fVf~w!=}TBYJAtZ{?oe_ zb$C|p4gMcfnQn+2SjMpJDtk_~zTCIt)9wT+Pq_2^?;QEhg*;a{V%DYq{%^ehHQx?j zVFAPb`LAB*B;IA*ow(si-`D8+;jaxDtXHW;5M* YSGY_|$EWX-B+!ivp00i_>zopr0K(W?JOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..abccf9ce060c9ccf30030ebc84abfb30bf2b0d70 GIT binary patch literal 1251 zcmV<91RVQ`P)O z@X{=q`UAY@hh)zm=+dQ=r*vg+eH?G4`-i^Z5Iwx;G;msohS=v zjoR$l9FBNLZ=q}S0f5E7qe3Vw#FSOSAiY9b?!Z~3UfG0B|;(r%;AWe z!x09(0T9l7M{l8{xA11~Z68pgJpNCYVXqG;bW`U}ne*C#(@;tqlD!L&S_1QYD;v}bK-jT-A3 z{U}IEiy$RH6p7=}cUg!J`XV}di$yU(7P1zQNuC#lR##9h&R+vm)G`~}t~95t1>`n( z5hUp!`EKyfzq82#S@Dvd2LMwu%>r6o!M6{-gGS7|^5+3rgIs`ko~Gvg@ctb+FS!e3 ziAY?H&=1H3c>Z*8zFtM%yBLsn2lB?90C{&HZ`=uxcL(yuwOR-K9}LUqVJTg>OfM|J zxjO*=9%FZ>ov@qPAxYU>SOChJ{3_u_xxnynApIL*0g{j}8zoE@o)|5HumDNO^MXtn zT{;b(1d~ka^c1KT3()Ec?6Z%;zY!K73Hh>d7y!ocw3ynwFLp8|>;i`Y;7F1$6Jy)u zB}`D|9)LCBBXVI2C}DyPK0S~~a{itrx<;Q@)G~Y&W`$GHBXVH@d=$`gPT5uD6xG@U znB7fySOoOVFNISP2)jUZQ)>}<+A3{A@aE%Y^vn({pKAcT$tMom6*@r@wg87s{eIuF zFIj*&9C58tTefS=%JZ00q`g>9UxY*}!8my|_^?X5l*&=$^C4z!PWLL)iF&j5mcJIb zv>|K(@!OfNfB!3bT3rz?)2G@C#QiS~j|{G=Q19-v*>8IWhvgv% z#Q1~-*xhL}b^U8@pM7Ki&^7w#8vVSAr7XOZbq?_hT340R<49xyuUNC}YDxvs017vU~K;9k58@FD7{{Z?7!((G$oO%EN N002ovPDHLkV1lL3GCBYN literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..abccf9ce060c9ccf30030ebc84abfb30bf2b0d70 GIT binary patch literal 1251 zcmV<91RVQ`P)O z@X{=q`UAY@hh)zm=+dQ=r*vg+eH?G4`-i^Z5Iwx;G;msohS=v zjoR$l9FBNLZ=q}S0f5E7qe3Vw#FSOSAiY9b?!Z~3UfG0B|;(r%;AWe z!x09(0T9l7M{l8{xA11~Z68pgJpNCYVXqG;bW`U}ne*C#(@;tqlD!L&S_1QYD;v}bK-jT-A3 z{U}IEiy$RH6p7=}cUg!J`XV}di$yU(7P1zQNuC#lR##9h&R+vm)G`~}t~95t1>`n( z5hUp!`EKyfzq82#S@Dvd2LMwu%>r6o!M6{-gGS7|^5+3rgIs`ko~Gvg@ctb+FS!e3 ziAY?H&=1H3c>Z*8zFtM%yBLsn2lB?90C{&HZ`=uxcL(yuwOR-K9}LUqVJTg>OfM|J zxjO*=9%FZ>ov@qPAxYU>SOChJ{3_u_xxnynApIL*0g{j}8zoE@o)|5HumDNO^MXtn zT{;b(1d~ka^c1KT3()Ec?6Z%;zY!K73Hh>d7y!ocw3ynwFLp8|>;i`Y;7F1$6Jy)u zB}`D|9)LCBBXVI2C}DyPK0S~~a{itrx<;Q@)G~Y&W`$GHBXVH@d=$`gPT5uD6xG@U znB7fySOoOVFNISP2)jUZQ)>}<+A3{A@aE%Y^vn({pKAcT$tMom6*@r@wg87s{eIuF zFIj*&9C58tTefS=%JZ00q`g>9UxY*}!8my|_^?X5l*&=$^C4z!PWLL)iF&j5mcJIb zv>|K(@!OfNfB!3bT3rz?)2G@C#QiS~j|{G=Q19-v*>8IWhvgv% z#Q1~-*xhL}b^U8@pM7Ki&^7w#8vVSAr7XOZbq?_hT340R<49xyuUNC}YDxvs017vU~K;9k58@FD7{{Z?7!((G$oO%EN N002ovPDHLkV1lL3GCBYN literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1969ef50a8147b499d444525a3c55be399b2de25 GIT binary patch literal 1689 zcmV;K24?w*P)W*_8{+ONs$yqQKFOT z0ft42yPA1BJ2N{&!WhH<8B19UkTn(rWGz6}SP+o409j)}K-L0ejRgT&3y?Jy1Y|8h z)>sgbwE$T|Npmtn$i!okoJJqtyTJ#MKVEmHntP@ezy)B8fiZ^PUi~@soR9C_V5_AH zR!bECU_X9WooYUkc0E80Gjl%n6K0DxQH+(LV&EuO!2Egv`!f4)>S zu>8T{x7nJuf?Blz0BCm{03iGH92Z{w{K$2pSlmIRST$93n�vA6h& zauT+;x5e`XO%s3pJ{>Vx`Ffw8^Zx{r^1YK&&vVb8KZ`BzOq^i5<8Wn}s%m0C0z)$` z6^)TGF)hQRH~{>;_wQ7)rcOY+<6xhjV|{fQ4y7n)+K88RC`GgR63ynzz&VV3j+4hY zd8(?hqrpdUcaATxb9~_$C;OJTNR@y~Vad^8$wPv!xJ*}E^!wCf4FO|0m_sSnSC^qH zE>l%a_>`l;5{?E-uq?|nu3o?E*;;Wit2}`8PEH8`Jgn=&FtR!f zIL~AJnzkaGpI>oq1%8x@2Fj+1J=-4ZTT-`xvS~tBT=^E^eql{p!O>ueg~VsZmF3FI zU#_n%hyJF#`auph3aRG-03cTQKxBLb0CtWqSV7a^P|8}Z76HKh0xM`5c8)1@1w^ud zNK`7O=UP>V;dBzr^eo_(YMyIdafw4IEXxwnp;R=OWm!C85C9(Kx%r2I$NYNzZXy|H zVgWKZ3AevB(QLjzLDR^dZ8M&^Ig|pnEtH=G-L5S@S1P8*BINI)FmnQAG#dBOY`y@b z{oQEXCjj_;G#U>)W8AKdJ==yo7@d#r{msosiDjA_0o|^RO2tH@aUXA9z4qkpz|f;t zDrW4J^Us|WsUC+3A=ucsGxj;Z^WsRV$h&uciO;q58g}3B0zj<8*Ic&%NB7dK%jS@X zJ$tA)zfOX!tt|i$*jm3+6@(lX0lm?|vFiP&Uy? z_ihlvj>l2RlztB^4zn`Z(jInIa0(`a0 zrkS{!8wI(2{`;$cBA=c67VsZ@JM3U2JV_iE}$JjM)yQa44Oq ztQABGSAJ5YN`Nc`Us2u>4ufS`uq+GRt{sbnpw5tgTeUk*U~eG^srvxAEzZHiTvUb^ zRwnbe&&R>Y=a|2J9);AS0B?)?1>hw7{L4>)#17+?+7En z11HV!LLhnzyrwAohM@L&5YldsGr29k{J~+qKH)TTi_f~^iuU>P2Z!76b{p;wCz;`w-MV_q;nGBhK%o zo(D*)5w|TK7m3^FQAm}5>o?cod-;I?AUnqw!fQ`T!ogt=4yBjv^9ukVwQ3=jrw4(TRa)00000NkvXXu0mjftxORY literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..23d219d61e9c89af35765099cbf7ee187ce022a3 GIT binary patch literal 1827 zcmV+;2i*9HP)-x~rK$Mdq zIl2Ev^7r_bOaFn=OMA%8g@iy!Q%VeWjn$MItsEijE@L<@XJ4OAZ( zB<;@ZdvD&ndGCE|gL97mGcsulkTxa;NLzrkF)={e0;G+J0n!#AZA=W1wg72kVt}*- zNE;Iaq%A<&$R#IQnTSt69JR7We-m=i`buQNf zNIA|qIOq8O#q-1;F;}W$u2coy8zL4G^#IN}Ow$4YoSq&70Iq$y0MoSKx(wfb`4wu* zHMDkGVhr8yhwCx`K&e<3E7&ZkQ_-%W&A>VTIhexX{0v7oRJ+ zfANOBkQ`e zDX+r3HHA0qT`VI+-2!~xnu)+*}3MWiU-k7@^zi2rtN6@3%m=*HMo3qdYqUX+cO~E*T**!c4>+#%OYk-Dl}GvE#G!%3G%eg-_+;dF*JUW= z&XvZH#}ec{Ps-DETH$)Vt`oz+Kyki2m!$x&Jt9>G;PciL?l%emfO%`mK+K~>rDW&$ zB*=XMKzm*O-F2DP+aw5i?>7n*FO){`8-UMSQ>ZQGY2U|E{Pgq~_Sy7^(1gzM2@1J$ z?dqwbz3fpD6qjLOcuLe3^I9Xw2H?YUbS&iw3zdr4r#d6-?(UBKu2OD&bqRC=`S*Ja z7<5dkj6gw<=Pe66M+}9WSMkBo5-(%Ec6}KDkm*Zy7Wfq}&(7fMn?(S) z(CGtU#FKZ9`aEx0a2OMTG6R6u>vakiW39Rl=cO7bQ2|ExvLAFj%45bk+hzE27{g(V zwjc+9jKdfXY#T^edBSgIsE2pw{1LqZR-*& zvDmprV+FwFDoz4bs}(exck%MYuR>u$yoLo<#nB>L>nS;AS-(j#dVOC584K)7$Az*1qn@Y%a4tX4du9? z7?6qqRJDSx?vK(5B7_Az6+W7_xUPVTip|YuBPUCg+~R{9KvxI&JwO*1ROPk|GGtV5 z_}~U`U5316iNB~7UU_yVRCz+9v7%Mp?-i+T0a-}u90Q|5hV>B$x-z@bSV5^+R&I%p zCI$drgHUcD$A+DwK6Z}!fpgUBb@E=ie+F-g$QpWn~lHdcjw)O!)Tcw5?V10Fo z59wz>(KY(RePI51utOxH8e)eT|6^U}9~iWaARxlpMLQ{xP7e||^Vl~UCRDk4@FOv%U>DTj^L zzQX~pYs&8r1VLtmRiH@SZrfN}dl1^1Q>|!l-7ppGt*u<$D!jh=5Gr{az z2idnyDEq2I%*KUat5xI2ts8)gr^2BWwEW(YAKhLj@H#!i^PU30ld2nlgld5x3Yutf z-FpEc*F97{;C-crFizb-xTpalQP4z-o2C^=oBJ?A)rY;S5VdZQkyIXFwDuiN6!hUy zf8?}~Uyx8GEuG^NIiLxu9syK+l)51d7dAi`1uZKZMw<^2Ox0hV7GsmB8xn~DVHC9A z?E`3YB~@Qr%zK`ZBz=Ba4G}>>>u7NmZJsn$ABAf)CjUG9KgYxXX$z1x{sZrPs>s65 RPiz1H002ovPDHLkV1mNOQnvsA literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/meta.json new file mode 100644 index 0000000000..9074c34c89 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "scope-inhand-left", + "directions": 4 + }, + { + "name": "scope-inhand-right", + "directions": 4 + }, + { + "name": "scope-wielded-left", + "directions": 4 + }, + { + "name": "scope-wielded-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bf559af36fc8925819380a4c792c7b0d63e7a26e GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq{|7 z)5S5QV$R!HhWyP6B5d-AM5B>jNxGi&+gqXV3&aIx#2aP}Oj=fi@+`n*2Qus4B z?h6_Wx(J-KKx7_^|QIpP$oS)Z%jdS?P*% WW_LFPnzH}{i^0>?&t;ucLK6U{lYlz_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3fa59b9ca9c507be20b3b557fe20ff2a1d3705 GIT binary patch literal 1695 zcmZuxdo&uITG1jDCEBP*BD6(J%k;rP>osXqC>m|Cwm7MdRYIw^ zm@!HxOia@@9V+pRHl`k>nl@P~B>d`^{kLY26aWBi ze?RO=C1d`C+!6Rr#KV1BBFxUS&k{h604PC6LPm#)A8%mUB}+yQ@) zz(>CCwNNB&uAyv_!A^li?O%&zTgi%$w|vbklLy1!(nxNm`;b@5+Do6WJ)cu07JXUb zi<q~FQm-}*Hrxi&hM3! z^U7+5<(_FMhl!m(J%s7U#yvmtbk)LtnAp+$&uP-Y?`}EeJvn7$soWpn??b@;d^DQ6 zWLf(8@DA5((E|i5dQ_L~iDT(Sfs5ivt!^LYYw32#6LQN-Yl9d0`NwVDC-0lz@p>Kp zVLJ-smLu>5we47tQQT2xQi>V5as&ns;yn4I$Dr#yVU|#IdrS=3`Z&1 zDCOT?YFX2M>zrgY8_%ny4Eg@f3)N$ZGt6TYyWkAgt4?NW=+eYdvC2Lp16D*dgO&?- z7cG69*7i(oJnur56f-!YgkQT+tJRnY8W0^gb$IXFyQ7mWy;i}R^it_%9=LVt(Ix`W z!xgFImT<)y{(dojqq}odTc;dy_#JVE&l>KnqeiwRBHtS3Cf=cLIoEx-gJ*eHl&!ybgak)q+#KzH)*>wpR&D2GGaIqt76WD zK9!83cSkO`R%Y)%9d^#|sl0Dnm}qMZv1xr%NF{e|%@5e=?cPC(YsP%9^;Zw&@^wex zwSW#~!@YDKm$wpZZ!>h>NNIxg%zm6maU`n=l~eU9ZWMvbjISQHj05OiIi@95XctPf zB>B4`2>k3jumio^($wqN)m)>JKZ&k)>3^GAao$AYyuNxcZt}dC(pOke%%_9-{hfaj;yF2x;IW>Br2_I!^;e@u} z&UZq^32fXxF4UvP?D?T`Mlw5ZRtN@o&Wa0=#H$0o@5*n+Cpu`r0KPyh(9I4%VSf&8 z$}f1txi-3a>w9psIidvQbPh)n-;zST7}u0%INmSozQ3*ac&3J@Oo8>W;dd> z>13I{4ie?`b2Csv?^g%H6#MzpeT^Pb9C}{xI?=p>0PFHO-NwD~_({;4z!w2H+IiSX z>F42=q?JOD`2qjH7ZLo+O&L|w_{?|^vHP~*9GamO3)D*iK%8*4_YlNAL)^ZA0RD6~ zq-I4lQ6=IQjX2V8VP+T9g4o!>=%Yeo&CI^_xku$Tv$wJ$*j7V#C=ZXrg8M+1d}c_r zo-sx+RaQX*vNmJ19)#Ne_~w*j4Rfd=R)EvYaqf2PP%L->manDn%XS7%~qw>9QHs}zv&e5@oCk!SGlkNJP9@)q6z literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-wielded-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/scope-wielded-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4a7e89a34d8a479aea3b1147585834dc810d81ba GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{DEQmc z#WAE}&f8hme1{A~4#WvY-zv$OF2}gz|Hc>Te8J`|0!uyxRQo4I&YX08O3!ZF@#+=8kYMn1^>bP0l+XkKEH8K~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..df8a799d4f4b72ce3ab52b9782918aec50439135 GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq{9a zr;B4q#hkaZt^Myfh_s$}+09#*qq2qnqsFG$O-x~oTvM8iE-hQ^dEWoA`VwYMRn`C& zfy|f}kU0(Q5oRlVW)A-~|uE2KyTaf3~V#-(l0Gx}(S~qdd&m z@W%~p-=az43=a;L3eU>6?4I{mUCDR0+A3)^=7zEeJ)Lt0FGe2PAd=`F&A=S-Ey(uc zX3`MIOl}2zPY2W*||dVM^~zNEMFyXFx+N-exNtjH^qDX;@wG)a*e&deLo!Q zbK(kvZ}x-BQ96>hXYVuH7QUnYp7w-U+Gn^uq&|rF=NUcWC`}Gz;bYuz^1CuigY@mm z%U$P9k$H4IM()5?IqhtLC4Kdpp}ZQ+j2ACz7wo@OuKIO~wyKTxrG|NY37`6o_kX|k zEb7^^wO7s`PS)P+_TUpk^IhJVXTpj#i|qw!_k8g3EZ@@l=81)suUpov&Rq>ZnB3WX z?(aPK?pSt)($g0|+|%CO`_HV9>TvJ!zxfvXHxxYW5h^bJKYIc0xWgKuV8JsX5`t4> z8<&};T>T#Z(3Ne8u(*x-&&V^UyZ;A$j!!x8FJbwG78^eO_fB@-9{gT>YU=!o`wpTt z^&vaLj=X<)^VH=tTOEC~Pwa~KZ_k-mP}y)H!e#T-NoP6NyShhn9ACMw!Rupjm6#VV z(4B`O%Grfe^L(=pe0Sfpq}J%Aq`+S04YoYXZZE@#gUU< zpNt?%;w{45n)aay)vJ{xJ89ZJ6 KT-G@yGywodL(~8O literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7c25c39f2a24d53da2de83e8cebf75ec6c83e621 GIT binary patch literal 1265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfq`YQ zr;B4q#hkaZ_vYVrlQ>o%9@6b{iIpd~NtSo2RmH~1w-{#~_z-d6=AM-I^QYbQHn0Ak zz@8y|IC4uwx9Z^~iyc*_y0Wfgt`zYMj9>SZTg$GyUw&8hz32C=@9ljb>7f~!`e(uH zhCC6b7itTnTN!q7zHn1)$Ya_S$bnUO<0qy+7H=QsmG;G5ysHBqY{-?@M6 zdcDkFv&|bXueO%_A=gk*KVx0_y!+=5D@R^meqMLo+<#YoE#sQtvUC%hKzl#Wh6FSjoxQf;UqFV`1Ditvp~tsgULLht z`H$SC82`@2$12tag>7$<=2?3C)l;dpZO>*fM8;UxPBdxq;JE4?Y0g{2Z~UwJrkDAn zV5VoU14Gv*gt)H_Qd=N$J>JyqeYyoxg0w2*!+^axUqjrVDQPxjsNYdt|48SGI8%at z;r};(ykFUxKK4JHU{Jd)j^&iJP@F-blZcl70-n4*8#2oG+z9RCE1%ahLodbpN!zy`Rh$qkCt^o2Tx@$KmW0AZnxf^ zyL`R-Uo?HFuK8NMVdtD3M>caA=$O5WE?8I=Fr6l<& z>kt3<#y3vx&u9JHSTTiRa#+RWp7;{xlA?QE#;5q#b$_V7;ih@cDLwsD)>^sg_w#z+ zZMVL6MnC$UfQ4oL$;+#ExBj1;G|8YluYu$82jScOL0=8${Em)$_wGZHdHqI{T<58; z8NL4QfA?=danStQUV~nBZsrKJ5CFt(V157PEa;+RP}WTx+@Tuga#!dk<#R-PrK<&c}H| z4=z6!V~B57WSa1-YRMNX@z^8pqdz>qzdbp-Ds$cG1K&4rx&}x-D?6U7FZB5D!*4e- zdp)HWa7qXt6`aOXdjYDq<%AV1H?NYNed_CNw@w9y4Uc@i zr_HglxM*_eaaiZ9cA#cfg`#s>OKycf7fbl_nz8fjg;hyU!<#Tlh&6i{{xkVp7rb{~ T;O8G;8OGr0>gTe~DWM4fgGNxy literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..c073b72bbb3f3e77666fece87161b32433803070 GIT binary patch literal 555 zcmV+`0@VG9P)(r1Wf~#+A`b+INdr#A5oy_@7lZV z54gdb7$I#C2pT#VUeCaF0D$#!Wq|D*&)W z4r0sQFmDdlsPTB>^?=93w%&|8Nw>GGs-y8CxZ_w>6^IDH&LeqlynThK zJz!;n4)$i9h!iv1eL}9#WN(X^XU4r`n(s=q28=lza~<5?o= znb=uB35BQL-D~#sagaCEcs%LN;{F)8If=9E33*EZr>Dd=ogJcL$TP#~FNJsT(Mg+LJ2mHah{?Xh)^XJ)fe)>{0}Y{V9@F3CV_l7ZMH z1F`u700(=AorPhRb>>QAtjw3jV3=hpwEoeWH}1rI%fQyw0DlLAm4b&^hCH8(U}g)T z-Cxx;V2pg)b`Ag$E$ju*8GjY6O_PCDVP=%Z%*8tKao*}^z9Cu6~nT?e(fxg9JaS1y)l1m?SiHLXqO z_J~Hfy1Z^P12owgpB#f|)H#3o%n-7#FIH>wsR2x<6C53l+uLKWOhlwm)%AztKKyd5 z>Ka4@VBRBIo8Z3EGzNmNqYI6RCgnvjv&(`)Pb(o*;~_E98}bAjpB%4LUTqUQQOXIn zeq+KNuC=j5)M;Xv@a^=63Gy79b`4yxGY$yXFmWUKH zTdzJ9Gh0`u^8MGv3%v$h1Gd7dx|Sa;CEo==|6E~l7ZMH1F=a4Vv`KSCK-s$JCjxa+V5XuU;qFB07*qoM6N<$g5{m`j{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de8d973e551bffc005deaa7e03c32f5495952976 GIT binary patch literal 579 zcmV-J0=)f+P)aN%iaMGo)J|aMn-<5mY zAFzcxF+v^)3>7I3*c1|JN}_#MoE&k0rZM(K&8&6_S&0aqGhW0da4lv5u`vsXjafi! z+yKDa*Y8GwOzV-aHb$(!HU^p2Dil8#^XyU1UkSLqO>vi|7bRy}BhQZ{m{|b0`a{zI z#@JtRJ^)12s|7H!r=qG%`vxurGov=B>Gyz1U@?2xL z*$My@#YzD{S+09_$Y*T}Kld6;5>ON$g?W!mYb@LDS&{&N-DWGFzkG7}yUi8=gy92ZZBXtcy$ z{36tWeE+QFhxe0qLnX;#G>gMA@O{=UiWRD=?N(W?r6^Wvx7oV8KF_s_Pa!k~?iwAw z0iV1bouS>0f-1|k5Rs}XcmKNwgu4B&p^{`Fp%Lm9&~?uWyGv8$i?qJ~&h!L=BV=Pw z%EZIN!*2k{!bhkvw+x`1;oZIAU0+Ju`vsXjXy|32aI{* RU>^Vg002ovPDHLkV1h}l`K$l{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..6616f309732c74e85cc62dfb52600a9581f82cfd GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tl z)5S3)qV?@{L#_q`0hf!N70iOY-}m?Xo|}-M{cWT0M$=D%&q8Ob-Hcbe67@A*cJF~` zz6F*I&lqMgXFwQH_djhaobg&@u}Ws-q9Q%7OkUml6R6s>qy+EbG?+9l+q}>gTe~DWM4fOYlP2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json new file mode 100644 index 0000000000..63a9c39c91 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "icon" + }, + { + "name": "mag-0" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..951e6c05979a3dd1b0076ddd1a1896fb49a045a0 GIT binary patch literal 1485 zcmV;;1v2`HP)1GAY;?Xob7*eO!&C#Vcg}auJ?Ff0ZU|!xIliqjR_WQ1&2xSVKo}Q4=SA~m5kHR4$6bo>|DV(_P zwjJd8K`{1C@ZJ!hC^VAiMnb^JyJMWZJGS?W#eMwy{@6Y@=y+U+#0PK`i~9h8cH6@0 zjM{U2bw)+IZ2>^fxlt&W%M6Ig362nyr<7z^T%Vf&-d=iFd?`(VE0ZN?XDSqn`z%2z zR%g_n2=w+JxtxN-69FkT>3XhFZz828(Wp0BF1JXW2?`g?DPT%XVm8wm%}Uioquz9T z1xu+(e5iKLCn&|VreXQ>-&AH8CcJ+k!L^bj=aH1!jmt* zu+PboaBiBY)l3{+SV&NcpMU)`(D%GA0xDILRjMY8l7Z|(mH@!cb^$xv1t&n9XQz%KIWkoDOc$LDzK#0OfMo4ug$)lN=tL@eu8q1WyF; zP`A7??^#JcEr#XvqGNPM3`L$S+?^^P>QY1JbwIXujhDrO2yV@9@&Mg zeJ@woi3Fv#(g{il0Q}L-48O`G(Wo~)TV|x6!=fdK-v@5ThoMUt6H8)Y>ORbv*lS8Ai!KrRpy$yp@88o8$9S1o0^FTcSPIT0X4LUvP!t+! zCnu6A@bdXnd)w*I_&GO6Hw=9Af$&OXkyeDl#2|&YHuHg>dvA)OqE&^7dt(7WG$h;` z3y2C21jH>s+!%WTq?}+bx7giM7yx4Y-T45?E<_}i4;a@9FsUJzTVxPw5~J1+JXnCt zMPb(Aqk>-<$KC?Qo&c#Sz`MMUAAb$trp5ha?X!r)@(wo{N5M-f%xX2$uE^d|c$QI$ z0P$gBE$=SDp|IVmA9bIU515leoH8?rb z6O3zxK$!b2%aW2u$^tl>wVK)2Lc@syqBj*=T}H`Z0B&7*KIcW{9Uh-0D3!_uWD_B~ zEiJx~&%dzN3CMsezfs6L-`UqXmjRLa#YlQeW!&lU+I%jzh{>zqof#kK`QGRF@E>d$ z1p@k(>p3B70YukzCWe)B)5NJ{V>4t7w6^q=YRlNNEI=|Bkp33n$}5W8+=>Ij07*|t z*(hMQrSGcp@F}B|4{$UjZFc=MH=}}I8NK8IxBjyjABc2?$bI;MVYI8nK1N9SfR7nt nZvhVk#4SMFcpxBd0piC0%3gytU`TbD00000NkvXXu0mjf-3h$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1d21fe8bad3145e5d65b84731ec18a0144fc2784 GIT binary patch literal 1665 zcmV-{27dX8P)y!XtMQusgPhoS{28ao1t7NBVC2q;>BqOl{OXaS1Gj)0;CC>lEgiWZ<~>gV^Ka{aSNBiv=j9pp?R2*MF})7b#!j901hb-ix*7V|mvD zEQ|$Fevc9>S&a=IR0@_`^fU0H9K?p(+H1L7*z-8XJuVxcz*K)6>(Xb5w-@ z07xm}`#wsXPk##nt^6bmXUHSvX;h02>B@nuKAh)c}A=7~K~H0Dx|{ z0|2O$YkDrj64=5x0Ik-s9=8m+6EF+{lsJcN3jk2j>cO)3j5{P)f%fl77(Qjjj7&a` z+{?=kspZW*2u{KflQ4wmeT3^C!gY^8ejAy!O7i)t5L$WHJ(~G5GH*7&>S--23Aqzc z;v7;+lsL!v*#)Gm0{{c2*722~D|p@&fUl$tBeOp_dB>!zqr~-ghf2AoztjEmND*5W zkShU}#W5NWm~9J8!Vpy>zJCV*>g42I;#k)`RK9|Xn33SCtb8;N&5>D_XCt8B5A+I=xtc5Hc~`J)k$UCk=gx{;(_zLK z-n{u`>3yc+CbBBh>)q(@FJHaH?dRLnV+(PCem~HMBmnvd9J7U{#{2j00YIMyE9Kfu zdYptp2mof4T}SaGq){ID&WfV#c6&PxLPa61*_-%o2=KhC*c5pgo;?Q8@%ZuaUYD)S zl{1T`X?B!(P!(xwgJ4_*XEYvYfz6^R6--uz<21jGAedCq&5E>@U=xKB5T|sdT+3A1 zAxJ4#DvoSj5F~fVilkF!61IYXd4;KHx++}vP^ZUf6Qr#mz+Ck#MGauO^5i-{HR{Er z!^;vY$7v>RPowc5b5R4BEsVVS^=I66|4lWnkX(RPJE?HFN;L2FZt(W)Z~D61?NA3f zRax!X37~Q}!L*2Ow=-h}SxenfcPSMKxi>}_W3Vi)D&^Wt3#{?FfnM(hz2412(bT-p zjN*(jFvie$-O#^P$~9EVHDy^`MbFY7LexD@C3EiY2Sh?DW2N=G0dXfhBEfZ!v>%_I zp2G94K!sB?$4Asd90mbK<3a2SSIRZ&NH4X3++DzNnhGnl#mV3M{Q#}jF)lAZpxtiA zZeyeIV7k%~v5wPJk;Smi^(XC0^R4rzkoz`h+XBslef=hf=?+hw@aF4(6vC7aEPXj$i^I%`M&VAp9<1|&4ERc{Z z0c*6ymqJR(ng{y}t#k8Ckp+3X02>AYs|vw}L7-hBA|g}19@jdL2-eS9N8n8+L#f;1 z%OIspY@KhF1;n+*spE^7ws=~^wa$It*UwuA8?gYhEgmVKnFLdLYMoEQFq1pQVPnbA z;%hMVnYMVEeBHK%indKgaU^c;b+D0K;9J60RD_Dej)0;CC>s9(yY*pWc{G=v00000 LNkvXXu0mjfiG~$> literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9e874151bbdb27d67b2b104868c8edc2e47fc3 GIT binary patch literal 1588 zcmV-42Fv-0P)kfa1dNeaoz6_|;1&|uMZkr&IzikT zjJq^f$$yW!Ytk8mTNmnd#dWr>kl`+i&z;u7xDlH|S7cIX-(+?*`%98NvZD_K((df& zy*F>(y!XCkLJ0hyv1VET(^wh6v;d~DGJt6TOk-sL(*l^r$^fPXFpZS~ObcKdD+8Do zz%9u1-L ztZZ2%tAHYJ2;DV_Bo7c3+eX>4z&TeZS}LeYmn{nw+os@6fo%kjblYJ)qFA`fuG?Uo*TmWBxqNVm zJs=J>=n2ki0Kj^eS7PY7X>U+BkfH*rnN5!@=3IbHCHjolYmkboQM8&po zc6tr~qQ1Aw;-?xg9RnCbtI?`+&e6NPdJ4hkf*Rm@msjANV>k)q2)#gi9Im@=BXWWB z8d(jx2c8MklR%uEp5y5F5S-WGdAE^)5f9+JCOq#JI#+qdV51-)#VIC8NCS}a0GR7G zUW)Pr#(9nDjIahol{X^Z6M*!K8(|HA=ypG0Fz}`F-R?&dGCnE>19^sPq>asvR^+T6zd!=03EW8+5vQG=}Y`@MxIUj*a_+b zDn}5(QW!v0o>n|f=p?xAek9kYZgyG>F;0%^l+O}chicW98RgGAHEjIwQ?5A{YJjZw zj%i<0uv3+9HV?GfVP4S6J5C+1fBOYD{lBpGPbu@cOamxq@KjgTbsMsIl0{7?<>ro4 zk0@TWA3^0Zfs9J!G9jr-&FcXot{|~5MM3R$DrAPfuiXYfz7jpHU{VvPq`5K;Kv@;i z`-So)g`@#HZ+7tQ>o)-Zt%m1$C|j2Fh?IgSLe*0urPlcBb;<_w(D}KyK-sdi#DYpd z41GV5i@*7DgOigJ0FxA$o~6_{Ui2ss7277ZI(j2VxlEY19A={+&`lx`(oV#?6(vzQ z=ir=c_dd-x^nFR$(Y;y9WgUv-0ZcO~bKQL)bkQ^#dTVoA9#cAKP5>=cPvi2I%UO#u z^D#(#Vej$^N5_W%Chc^EO^$2_+T%1fj+h5Xw zBf<`SA4kWB@Vr~rySx$rrsy?_%4x}oQYy<+r@prk!ZS{?fduu%MJRi-s;z z(<6ndhh}@t^ZHKVEf6nG;xu%~xGaKVlT`g+;6EBwKW{3WNkh}#_B=0hrRY8dx-_cZ zaq80W^I(zHU@8qAe-9xGoY#cXGK(lbPq`e&qRZh#8oJZD$X)CZTkX30?EU*cwA*Qx za#@Fk_XFZIbeJaq$j3dp?!Hjx&>elVl*>t2xB+xDw7T+X1x~eUi!e=24Wf&DX)`kq mcImj00006%hWY}Yr>+U z1fDgema8%@H`ef$`dXzhi&bwX^T*k;{j%1*xAsLJoiB2-^Z4g|-_KSjAAire)|5}u zzEJpqn>K?vW8M~~0{qO9Z#z$XUh>YXb8FBEBh?q?3@^Mm8Ismck-R@ONdC7SL&DaW zNB)<1B+erMm~8{aoZ=?Sth9{M0NeY*VDD9wbOEDRG2=Bcmd6*>O$PT|G( zycgc{X1Q`4-oEwD>HvX++qV~L%zB|<;W+D_QkU9}ivM}VkG_O6NH68|EYjT-lr+_v zDd)(-Q1ydZ4y*Hy^|~c@^_)7PcqT2pV^QZkzvXE$BEDa8%2XF+1WEGB8VR&LpE_CX zWO(tO2%U+`G$%c|W#P79>RYeQYD5F6V83DZf<%kZ}%r`Q)%T-!4u(k=babZ z%-QW)m?JPpp)Yx_s;CS5jVID;ALW##Ug>_k!=Uipl)@wDQh(Lfly%*F({=9fXO&Gp zoWHHkPoBzjW5fE5--V^4gANr)^&XSptF_MJVHeu^*vhHn@eYAop=>ftObmJdeq82R za@Oel_gf#9TE?^&J?A#d-EqIaRzA?g@c!GW{+DkHu_r#?yZ6z7?;rRN7Z>lzwwR>+ zEzP~0&uZOnJ_p6tHwr8sHT(k z#%s?HTR%>k_}$s{fcFB?hS?0}QH(n{3l<}oj~}pBTy=lAZ2GL-N%!k#hFbjK$Y6b- zcAz(mA&==!#ns&hir?Kk-`d>Y&@BF-{AZgyq-hh`D~YpSIf+$ zdK1Mn?dyL9WvZ_?pOq{fQd@LiCI4}hkVAH^+ES_g-Wuj>)&@;K@cmHo!hhR(FX#ai z0^fZ5T0>KhO*3!n-&6@~=>4(#hVIe^f!o}^OsjI z^_}edDnRi|HS^obp!HK1J?o0vy>+RfInxRUE16$QtEz!1%yS+0S>7u*14BQQ6#g%0 zznGD;?{?Yp%bJfY^sa9G^lIyZt`fWUZCpE+W^L|XX1gF^iq@L$qniTQ)Jv9L$zFP7 zTUDL#v(K}GHnWv34JdAtzVvwWWhY&O_qs}Uy=K|(nXXtkdR!vJPIqiOmaenDW``bB8H*z{E?{%-6!gM2K&+9kSf*xEb_~75Pmf;S|j*DCe zd>f>ZnEx4<#{FinUa4;gEMpivUHx3vIVCi$51lKwKX~nvT{71K)&wi>{QCZNubb6r zhlGHbonkhers-^R%zx-RZQ?x9rr(gmwCN$Y!t92eA516I6r`WWHT-8-v(!Sm{N)Nc GWJ3WI8A0*@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53bfbe3639d0981749c586da1bc48725c024a056 GIT binary patch literal 1950 zcmZuxX*kr28~x4LM$ENMXslUUCQA(&!WbHRFOVYHNda-dD`O zfC%q%Mc~z$eG$E4<3R!d9rb?!ig{ob1ptEfwpeqQ7{=!dHDO$gJQ?MxH*s7e6@L3* z3~hw+z)wg|4^riln~}cA3mkl|k30`ol3&M65pjQ@D(uwcG~NrZ@WTCB_YBkG z==0VWXMghBc+=4zejPlL%+Xo66AEs25+l$lp(EglBLsyepjmXnN}KXuc8{`mBQ3O! z*8)&%6)({=(!aqO0+fOyq5#1l?m0(!rPb6dK0c)KWchln<3 zpn>_JYVo76BxO(+8n*&{I2_dM7wS0FE&D^X`OB0J#5+qYKP48T)YKxmmvikb%n>27G<_GeFNfSv1&QSl% zk{3Vih!Y~P3l>aZQHnY?btADE*hg>sA1n*joRk-5LxLLQ#f69dbczjE1`>Ap)V{>+ z?}ZQL1t@{p5NY2+=y6U+UO5|}+jN zk9%>2W^iaQPHEBw*pR85?|_T`;RNcb;dIa}!E@_TXR zdzZ|Y^!@E3ynFOnH3zcLN~Nx4tE=uZWuqY_(eZ3k`yFu8PXw*Aq#6?1m*iSRC_Gqf zok0oRoZ)u$X9-04P!fsfYb$tsM2I4&84{+TU-*oMMC3SV>H4~?BRwMTIxXk%ATZ2f1zS4q;pH!3 zPuS@eHyUV7qFv{)E(hP;$jriy5n0 zcv|$=ZR0N)XLwG-V-N%ik*Uov1BdJ!3Q9t{@BbRW*3to6Z9%yH zTglnODj6zfGG+;-Pu8xEKU(VP{a&G)$eIXvbHbkFSGR19lNj0C**g1ey~j%BLi{jl zZ6QnbCrG@v4AR3>H{&pT#1C7}WlEjG)5_Gt5;)qXloSI!4$ORiZh+pWQ^iEf)2QcP zugR_C8MSRkQ8JYae8|S`&zWwZ-ht(QkSfz9RmM#?cj5luzcc>o@(S>@U`)pzlpJNy z^_ebL_LeZsouA?bw!&I;fz0Bky5yO;*AfxbG40`c6j^iy)Hf4Rqq6OOW9pfA`Gq9{ zNihd=XkJGHVGsv>zw$g>1Co1vliTXH^Y`s=}g z4GQ<%u;jaf5o(T#N=Nj17`dM8rN==VksPM|yD)QTwWq=xx3WwL%VH5zBiaqboF7n2 zd`eI?F(-g*)p!UWDB>eDWvsiZ1eRm)2JU14-rl8OMbV<%D?@FJdY|T5j zY+1C+)L#VE-Qb!?AYyPVJ^M*(PTnQ5Z7Y%TzONiHPzrZ?P2LkZ9$hNHX*1&+6@Z_y zu7$I&MXq#ZxVV8AADg{XTXQC$@_pqo!g1)aBCf=-VRNYdd4=(wcQ0paN38IYi5qx{ z{b=A>fUSYLE3E$#XCU@oFFQfVEMP)i#-M0~Nzura9TeTXCd?!CAp*eMSKo{u_Eql7SFpdD`ZT;kjh9&dbG5ona zVNPh`hd1n5Mbl%Pi~H%F#Z1{_y_o4npFS* literal 0 HcmV?d00001 From c28f5648d0898513d4ed570c944cc84b8947d508 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Thu, 27 Jun 2024 20:55:13 +0000 Subject: [PATCH 11/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 633af092a7..c6f9280888 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -5011,3 +5011,20 @@ id: 329 time: '2024-06-27T18:29:16.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/388 +- author: ThereDrD + changes: + - message: "\u0411\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u043E \u0441\ + \u043F\u0440\u0430\u0439\u0442\u043E\u0432 \u043E\u0440\u0443\u0436\u0438\u044F\ + \ \u0431\u044B\u043B\u043E \u043F\u0435\u0440\u0435\u0440\u0438\u0441\u043E\u0432\ + \u0430\u043D\u043E" + type: Add + - message: "\u041E\u0440\u0443\u0436\u0438\u0435, \u043D\u0435 \u0438\u043C\u0435\ + \u0432\u0448\u0435\u0435 \u0440\u0430\u043D\u044C\u0448\u0435 \u0441\u0432\u043E\ + \u0438\u0445 \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0445\ + \ \u0441\u043F\u0440\u0430\u0439\u0442\u043E\u0432 \u0432 \u0440\u0443\u043A\ + \u0430\u0445 \u0438 \u043D\u0430 \u0442\u0435\u043B\u0435 \u043F\u043E\u043B\ + \u0443\u0447\u0438\u043B\u043E \u0438\u0445" + type: Add + id: 330 + time: '2024-06-27T20:54:09.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/387