diff --git a/Content.Server/Store/Conditions/BuyerAntagCondition.cs b/Content.Server/Store/Conditions/BuyerAntagCondition.cs index 4b1b6013eb..0d1c33a61a 100644 --- a/Content.Server/Store/Conditions/BuyerAntagCondition.cs +++ b/Content.Server/Store/Conditions/BuyerAntagCondition.cs @@ -27,13 +27,12 @@ public sealed partial class BuyerAntagCondition : ListingCondition public override bool Condition(ListingConditionArgs args) { var ent = args.EntityManager; - var minds = ent.System(); - if (!minds.TryGetMind(args.Buyer, out var mindId, out var mind)) - return true; + if (!ent.HasComponent(args.Buyer)) + return true; // inanimate objects don't have minds var roleSystem = ent.System(); - var roles = roleSystem.MindGetAllRoleInfo(mindId); + var roles = roleSystem.MindGetAllRoleInfo(args.Buyer); if (Blacklist != null) { diff --git a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs index 43c06efad3..ce2cb47073 100644 --- a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs +++ b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs @@ -30,14 +30,12 @@ public sealed partial class BuyerDepartmentCondition : ListingCondition var prototypeManager = IoCManager.Resolve(); var ent = args.EntityManager; - var minds = ent.System(); - // this is for things like surplus crate - if (!minds.TryGetMind(args.Buyer, out var mindId, out _)) - return true; + if (!ent.TryGetComponent(args.Buyer, out var _)) + return true; // inanimate objects don't have minds var jobs = ent.System(); - jobs.MindTryGetJob(mindId, out var job); + jobs.MindTryGetJob(args.Buyer, out var job); if (Blacklist != null && job != null) { diff --git a/Content.Server/Store/Conditions/BuyerJobCondition.cs b/Content.Server/Store/Conditions/BuyerJobCondition.cs index 1ff4a97c33..eb452e0dcf 100644 --- a/Content.Server/Store/Conditions/BuyerJobCondition.cs +++ b/Content.Server/Store/Conditions/BuyerJobCondition.cs @@ -27,14 +27,12 @@ public sealed partial class BuyerJobCondition : ListingCondition public override bool Condition(ListingConditionArgs args) { var ent = args.EntityManager; - var minds = ent.System(); - // this is for things like surplus crate - if (!minds.TryGetMind(args.Buyer, out var mindId, out _)) - return true; + if (!ent.TryGetComponent(args.Buyer, out var _)) + return true; // inanimate objects don't have minds var jobs = ent.System(); - jobs.MindTryGetJob(mindId, out var job); + jobs.MindTryGetJob(args.Buyer, out var job); if (Blacklist != null) { diff --git a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs index 1df4fce177..a4f1227ecc 100644 --- a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs +++ b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs @@ -2,6 +2,7 @@ using Content.Shared.Humanoid; using Content.Shared.Store; using Content.Shared.Humanoid.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; +using Content.Shared.Mind; namespace Content.Server.Store.Conditions; @@ -27,7 +28,10 @@ public sealed partial class BuyerSpeciesCondition : ListingCondition { var ent = args.EntityManager; - if (!ent.TryGetComponent(args.Buyer, out var appearance)) + if (!ent.TryGetComponent(args.Buyer, out var mind)) + return true; // needed to obtain body entityuid to check for humanoid appearance + + if (!ent.TryGetComponent(mind.OwnedEntity, out var appearance)) return true; // inanimate or non-humanoid entities should be handled elsewhere, main example being surplus crates if (Blacklist != null) diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index 05b5b281b1..bdc0c245cd 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -10,6 +10,7 @@ using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using System.Linq; +using Content.Shared.Mind; namespace Content.Server.Store.Systems; @@ -69,10 +70,13 @@ public sealed partial class StoreSystem : EntitySystem if (!component.OwnerOnly) return; - component.AccountOwner ??= args.User; + if (!_mind.TryGetMind(args.User, out var mind, out _)) + return; + + component.AccountOwner ??= mind; DebugTools.Assert(component.AccountOwner != null); - if (component.AccountOwner == args.User) + if (component.AccountOwner == mind) return; _popup.PopupEntity(Loc.GetString("store-not-account-owner", ("store", uid)), uid, args.User); diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs index f4eb5e2d65..87092b4476 100644 --- a/Content.Server/Traitor/Uplink/UplinkSystem.cs +++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.FixedPoint; using Content.Shared.Hands.EntitySystems; using Content.Shared.Implants; using Content.Shared.Inventory; +using Content.Shared.Mind; using Content.Shared.PDA; using Content.Shared.Store; using Content.Shared.Store.Components; @@ -20,6 +21,7 @@ public sealed class UplinkSystem : EntitySystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly StoreSystem _store = default!; [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly TagSystem _tagSystem = default!; [ValidatePrototypeId] @@ -63,8 +65,12 @@ public sealed class UplinkSystem : EntitySystem /// public void SetUplink(EntityUid user, EntityUid uplink, FixedPoint2 balance, bool giveDiscounts) { + if (!_mind.TryGetMind(user, out var mind, out _)) + return; + var store = EnsureComp(uplink); - store.AccountOwner = user; + + store.AccountOwner = mind; store.Balance.Clear(); _store.TryAddCurrency(new Dictionary { { TelecrystalCurrencyPrototype, balance } }, @@ -72,10 +78,10 @@ public sealed class UplinkSystem : EntitySystem store); var uplinkInitializedEvent = new StoreInitializedEvent( - TargetUser: user, + TargetUser: mind, Store: uplink, UseDiscounts: giveDiscounts, - Listings: _store.GetAvailableListings(user, uplink, store) + Listings: _store.GetAvailableListings(mind, uplink, store) .ToArray()); RaiseLocalEvent(ref uplinkInitializedEvent); } diff --git a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs index 307a5e1986..126031dc6b 100644 --- a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs +++ b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs @@ -13,13 +13,13 @@ public sealed partial class EnsnareableComponent : Component /// /// How much should this slow down the entities walk? /// - [DataField] + [DataField, AutoNetworkedField] public float WalkSpeed = 1.0f; /// /// How much should this slow down the entities sprint? /// - [DataField] + [DataField, AutoNetworkedField] public float SprintSpeed = 1.0f; /// diff --git a/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs b/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs index f900d863c2..b05ce151d8 100644 --- a/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs +++ b/Content.Shared/Ensnaring/Components/EnsnaringComponent.cs @@ -38,6 +38,12 @@ public sealed partial class EnsnaringComponent : Component [DataField] public float StaminaDamage = 55f; + /// + /// How many times can the ensnare be applied to the same target? + /// + [DataField] + public float MaxEnsnares = 1; + /// /// Should this ensnare someone when thrown? /// diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs index 551c76ff8d..dacb773470 100644 --- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs +++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs @@ -256,23 +256,18 @@ public abstract class SharedEnsnareableSystem : EntitySystem if (!TryComp(target, out var ensnareable)) return false; - // Need to insert before free legs check. - Container.Insert(ensnare, ensnareable.Container); + var numEnsnares = ensnareable.Container.ContainedEntities.Count; - var legs = _body.GetBodyChildrenOfType(target, BodyPartType.Leg).Count(); - var ensnaredLegs = (2 * ensnareable.Container.ContainedEntities.Count); - var freeLegs = legs - ensnaredLegs; - - if (freeLegs > 0) + //Don't do anything if the maximum number of ensnares is applied. + if (numEnsnares >= component.MaxEnsnares) return false; - // Apply stamina damage to target if they weren't ensnared before. - if (ensnareable.IsEnsnared != true) + Container.Insert(ensnare, ensnareable.Container); + + // Apply stamina damage to target + if (TryComp(target, out var stamina)) { - if (TryComp(target, out var stamina)) - { - _stamina.TakeStaminaDamage(target, component.StaminaDamage, with: ensnare, component: stamina); - } + _stamina.TakeStaminaDamage(target, component.StaminaDamage, with: ensnare, component: stamina); } component.Ensnared = target; diff --git a/Content.Shared/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs index e5171dec41..19d13e6d05 100644 --- a/Content.Shared/Store/Components/StoreComponent.cs +++ b/Content.Shared/Store/Components/StoreComponent.cs @@ -37,10 +37,10 @@ public sealed partial class StoreComponent : Component public HashSet> CurrencyWhitelist = new(); /// - /// The person who "owns" the store/account. Used if you want the listings to be fixed + /// The person/mind who "owns" the store/account. Used if you want the listings to be fixed /// regardless of who activated it. I.E. role specific items for uplinks. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public EntityUid? AccountOwner = null; /// diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 362e8427e2..4ea524d19a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,22 +1,4 @@ Entries: -- author: ArchRBX - changes: - - message: Mass scanners and shuttle consoles now display coordinates beneath IFF - labels - type: Add - - message: IFF labels that are beyond the viewport extents maintain their heading - and don't hug corners - type: Fix - id: 7396 - time: '2024-09-19T01:25:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31501 -- author: coffeeware - changes: - - message: a powered TEG won't produce infinite power when destroyed - type: Fix - id: 7397 - time: '2024-09-19T02:15:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29972 - author: Boaz1111 changes: - message: Added plasma and uranium arrows. @@ -3910,3 +3892,17 @@ id: 7895 time: '2025-02-03T23:33:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32934 +- author: ps3moira + changes: + - message: Changed 3D item sprites to cabinet perspective + type: Tweak + id: 7896 + time: '2025-02-04T07:52:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34293 +- author: impubbi + changes: + - message: Bolas will now only be applied once. + type: Fix + id: 7897 + time: '2025-02-04T16:11:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34723 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index 42b4453573..ac7f02bd22 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -52,7 +52,7 @@ id: ServiceSmokeables icon: sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi - state: closed + state: icon product: CrateServiceSmokeables cost: 1500 category: cargoproduct-category-name-service @@ -62,7 +62,7 @@ id: ServiceCustomSmokable icon: sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi - state: closed + state: icon product: CrateServiceCustomSmokable cost: 1000 category: cargoproduct-category-name-service diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 30c74f6759..20fa192ffb 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -202,7 +202,7 @@ - id: FoodCondimentPacketKetchup - type: Sprite layers: - - state: box_olive + - state: box - state: writing - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 236cf6f27f..fe690d8bd1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -493,9 +493,6 @@ state: box layers: - state: box - map: ["closeLayer"] - - state: box-open - map: ["openLayer"] - type: Item sprite: Objects/Storage/Happyhonk/clown.rsi heldPrefix: box diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml index 6dcb627652..869cb34180 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml @@ -6,11 +6,7 @@ components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi - layers: - - state: closed - map: ["closeLayer"] - - state: open - map: ["openLayer"] + state: icon - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi size: Normal @@ -37,8 +33,7 @@ components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi - layers: - - state: closed + state: icon - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi - type: StorageFill @@ -54,8 +49,7 @@ components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi - layers: - - state: closed + state: icon - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi - type: StorageFill @@ -71,8 +65,7 @@ components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi - layers: - - state: closed + state: icon - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi - type: StorageFill @@ -88,8 +81,7 @@ components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi - layers: - - state: closed + state: icon - type: Item sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi - type: StorageFill diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index 8fe03f3c6e..ab071c7a18 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -25,26 +25,6 @@ - type: Appearance # Boxes -- type: entity - parent: BaseMagazineBoxAntiMateriel - id: MagazineBoxAntiMaterielBig - name: ammunition box (.60 anti-materiel) - components: - - type: BallisticAmmoProvider - capacity: 30 - proto: CartridgeAntiMateriel - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: magb - steps: 4 - zeroVisible: false - - type: Appearance - - type: entity parent: BaseMagazineBoxAntiMateriel id: MagazineBoxAntiMateriel diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 3af2b7affb..89ac57e9f6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -25,46 +25,6 @@ - type: Appearance # Boxes -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifle10x24 - name: ammunition box (.25 caseless) - components: - - type: BallisticAmmoProvider - capacity: 200 - proto: CartridgeCaselessRifle - - type: Sprite - layers: - - state: base-10x24 - map: ["enum.GunVisualLayers.Base"] - - state: mag10-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag10 - steps: 4 - zeroVisible: false - - type: Appearance - -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleBig - name: ammunition box (.25 caseless) - components: - - type: BallisticAmmoProvider - capacity: 200 - proto: CartridgeCaselessRifle - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: magb - steps: 4 - zeroVisible: false - - type: Appearance - - type: entity parent: BaseMagazineBoxCaselessRifle id: MagazineBoxCaselessRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index a947b2c79b..67662cbcb6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -29,21 +29,17 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifleBig name: ammunition box (.30 rifle) + suffix: Big components: - type: BallisticAmmoProvider capacity: 200 proto: CartridgeLightRifle - type: Sprite layers: - - state: base-b + - state: base map: ["enum.GunVisualLayers.Base"] - - state: magb-1 + - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: magb - steps: 4 - zeroVisible: false - - type: Appearance - type: entity parent: BaseMagazineBoxLightRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index e80e7ad72b..92660de36f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -28,18 +28,19 @@ parent: BaseMagazineBoxRifle id: MagazineBoxRifleBig name: ammunition box (.20 rifle) + suffix: Big components: - type: BallisticAmmoProvider capacity: 200 proto: CartridgeRifle - type: Sprite layers: - - state: base-b + - state: base-big map: ["enum.GunVisualLayers.Base"] - - state: magb-1 + - state: mag-big-1 map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals - magState: magb + magState: mag-big steps: 4 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index b6c7e8d278..0431890f91 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -52,11 +52,15 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunBeanbag + - type: MagazineVisuals + magState: mag-beanbag + steps: 5 + zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-beanbag-1 map: ["enum.GunVisualLayers.Mag"] - state: beanbag @@ -83,14 +87,14 @@ - type: BallisticAmmoProvider proto: ShellShotgunSlug - type: MagazineVisuals - magState: mag-alt + magState: mag-slug steps: 5 zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-alt-1 + - state: mag-slug-1 map: ["enum.GunVisualLayers.Mag"] - state: slug @@ -101,11 +105,15 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunFlare + - type: MagazineVisuals + magState: mag-flare + steps: 5 + zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-flare-1 map: ["enum.GunVisualLayers.Mag"] - state: flare @@ -116,11 +124,15 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunIncendiary + - type: MagazineVisuals + magState: mag-incend + steps: 5 + zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-incend-1 map: ["enum.GunVisualLayers.Mag"] - state: incendiary @@ -132,14 +144,14 @@ - type: BallisticAmmoProvider proto: ShellShotgunUranium - type: MagazineVisuals - magState: mag-alt + magState: mag-uranium steps: 5 zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-alt-1 + - state: mag-uranium-1 map: ["enum.GunVisualLayers.Mag"] - state: uranium @@ -150,11 +162,15 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunPractice + - type: MagazineVisuals + magState: mag-practice + steps: 5 + zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-practice-1 map: ["enum.GunVisualLayers.Mag"] - state: practice @@ -165,10 +181,14 @@ components: - type: BallisticAmmoProvider proto: ShellTranquilizer + - type: MagazineVisuals + magState: mag-tranq + steps: 5 + zeroVisible: false - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-tranq-1 map: ["enum.GunVisualLayers.Mag"] - state: tranquilizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index 11649f3db3..e917461095 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -39,11 +39,15 @@ - type: BallisticAmmoProvider proto: CartridgeCap capacity: 20 + - type: MagazineVisuals + magState: mag-cap + steps: 4 + zeroVisible: false - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi layers: - - state: capbase + - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-cap-1 map: ["enum.GunVisualLayers.Mag"] - - state: cap + - state: capbase 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 c1e2a7a77f..9fe266dfed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -241,20 +241,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolHighCapacityRubber - name: machine pistol magazine (.35 auto rubber) - parent: BaseMagazinePistolHighCapacity - components: - - type: BallisticAmmoProvider - proto: CartridgePistol - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolSubMachineGun name: SMG magazine (.35 auto) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml index f8d5efb8c6..f6630adbb3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml @@ -47,4 +47,5 @@ staminaDamage: 0 # anything but this is gamebreaking canThrowTrigger: true canMoveBreakout: true + maxEnsnares: 1 - type: LandAtCursor diff --git a/Resources/Prototypes/Magic/mindswap_spell.yml b/Resources/Prototypes/Magic/mindswap_spell.yml index 19b3d41e70..bc2a8d11be 100644 --- a/Resources/Prototypes/Magic/mindswap_spell.yml +++ b/Resources/Prototypes/Magic/mindswap_spell.yml @@ -9,6 +9,7 @@ whitelist: components: - Body + - MindContainer canTargetSelf: false interactOnMiss: false sound: !type:SoundPathSpecifier diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png index f8064c8a1e..25c2a7f538 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png index c2c7c7a503..f4b7bc3409 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png index c84d483006..23898baeec 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png index aa82f12f19..18103fd70b 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png index eba69a81bd..89fa566daa 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json index a2228b340e..3cbfe7d8e8 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub), modified by ps3moira (GitHub)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png index 422474a670..7075a537f1 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png index fc539e9bf4..ceb45b7a45 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png index c69cbd9156..16d562fc35 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png index 3585f3f569..750a1c23c7 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png index c6f6d44f17..e0285dc941 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png index f1a41cf55b..4710baadb8 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png index 025fe8e3da..137f8b1194 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png index 16121a0c87..17264c3a9c 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png index f8a1e823d1..818f634f7e 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png index aa4b401e32..a47f285299 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png index 3e56e8cdcb..253d2ffe31 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png index 54cee84ddd..e6bd50c9b2 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json index 6bf91e3f54..837de9f8e8 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, further modified by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png index 2b414ee5c6..725ef66704 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png index 1357348e8e..9d59629634 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png index 53175f9263..d1af5c0b39 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png index e3b5cebcf5..3fcb309665 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png index c1a63e01ed..386b6fe076 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png index b9e81b894d..755bdd3369 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png deleted file mode 100644 index a2d008910c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png new file mode 100644 index 0000000000..b39c84b1e6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png index fa238f8de7..58b4056c77 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png index 263f797355..1f4db596b3 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json index 00190d8818..fb6ce03e39 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json @@ -1,17 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "open" - }, - { - "name": "closed" + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png deleted file mode 100644 index be3e5ff1ee..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png deleted file mode 100644 index 830e4c6953..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png new file mode 100644 index 0000000000..cdfe3ff3b0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png index 4022576f4e..94b0334e81 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png index c369df8d2c..bc7bada0ec 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json index 00190d8818..fb6ce03e39 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json @@ -1,17 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "open" - }, - { - "name": "closed" + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png deleted file mode 100644 index 78a710de74..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png deleted file mode 100644 index 61cc98703d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png new file mode 100644 index 0000000000..9254f71366 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png index 27f428832a..ff3c5b713f 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png index c4007a3355..e777898603 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json index 00190d8818..fb6ce03e39 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json @@ -1,17 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "open" - }, - { - "name": "closed" + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png deleted file mode 100644 index 14eb8b6ca8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png deleted file mode 100644 index d0598011a3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png new file mode 100644 index 0000000000..1f9dd7aee8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png index ea9384ff29..4a9b516e20 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png index 14ea17075c..5309bd5336 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json index 10a573f423..1afc0df758 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json @@ -1,17 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "open" - }, - { - "name": "closed" + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png deleted file mode 100644 index fe7e453441..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png deleted file mode 100644 index 79e47ba47b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png new file mode 100644 index 0000000000..f1b8138574 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png index 683e37bb45..c31e90a57c 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png index 57468a3b1b..1a5afb48f5 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json index 00190d8818..fb6ce03e39 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json @@ -1,17 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "open" - }, - { - "name": "closed" + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png deleted file mode 100644 index ad4eb63127..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png index 0b18a29cda..f8da9f8763 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png index d49b6f112c..8412a415e1 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png index fa238f8de7..58b4056c77 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png index 263f797355..1f4db596b3 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json index 892cbe9a31..eadeef0774 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png index 482f53e0d6..ae1b2f52ad 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png index 601d8927fb..1b96f9a177 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png index 21a07b90c8..e7ea2c85c2 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png index d49b6f112c..1eaa2dfd84 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png index 4022576f4e..94b0334e81 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png index c369df8d2c..bc7bada0ec 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json index 892cbe9a31..eadeef0774 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png index 60c7f9975d..7be3b84612 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png index a80b8ec860..a2a1bfd949 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png index fa5fa930c1..c2407a0475 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png index d49b6f112c..b95d877ded 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png index 27f428832a..ff3c5b713f 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png index c4007a3355..e777898603 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json index 892cbe9a31..eadeef0774 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png index 463e51db96..62df18380f 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png index 65470ecb3f..78323f265b 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png index 992b30b7aa..09153f3251 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png index d49b6f112c..6e6ea0a808 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png index d879baa48b..4a9b516e20 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png index 4e239e6532..5309bd5336 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json index 892cbe9a31..eadeef0774 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png index 5f076005e3..3f358004ff 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png index 874c15245b..d0d519fbd4 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png index 6faf9c0567..364beae421 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png index d49b6f112c..0404328f3a 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png index 683e37bb45..c31e90a57c 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png index 57468a3b1b..1a5afb48f5 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json index 892cbe9a31..eadeef0774 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png index 977b9bb1f9..d98ac648f0 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png index d3ded3558d..3fa0f2bc46 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png index 2b2cb8acf7..37abebd398 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png index d49b6f112c..983ee61e78 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png index fa238f8de7..cc089e2378 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png index 263f797355..a35c71bd52 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json index bd6e6c3748..6b70636a07 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from sprite taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png index be3d377807..9d5e3cbbdb 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png index 89222ad9b2..6eeb31fd76 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png index cc8c846f38..9cc8927426 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png index 446d606c89..fecc21f89c 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png index 72e1aa40d4..d7568b10e6 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png index 0d9b28188e..8693f90fa9 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png index b79eef3d2d..ed9be4002d 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png index 8f39716ef2..05de691922 100644 Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json index 9e0bb8c848..d5fe85aa8f 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Decoration/present.rsi/meta.json b/Resources/Textures/Objects/Decoration/present.rsi/meta.json index aa1e0acf4c..a86780f63c 100644 --- a/Resources/Textures/Objects/Decoration/present.rsi/meta.json +++ b/Resources/Textures/Objects/Decoration/present.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made with love by Shaeone", + "copyright": "Made with love by Shaeone, modified by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Decoration/present.rsi/present.png b/Resources/Textures/Objects/Decoration/present.rsi/present.png index 2763474a10..bd70a5c6b0 100644 Binary files a/Resources/Textures/Objects/Decoration/present.rsi/present.png and b/Resources/Textures/Objects/Decoration/present.rsi/present.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png index 320d84905c..3116c6c6e5 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/base.png b/Resources/Textures/Objects/Devices/flatpack.rsi/base.png index 628808adc7..fc8002fa43 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/base.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/base.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png index 63c0450e73..83d334c6e7 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png index c663886f9c..d1b4191052 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png index 428918e731..c7872e1916 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png index 847aab5536..e4b67a0966 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png b/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png index da9da035a0..a7aa8023f3 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index bb5b49e185..947aca7a33 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", + "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef, modified by ps3moira", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png b/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png index c066933cd5..e9dfa58efb 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png index 34411a4c74..40cf75ad49 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png index b73a2cac28..62449e6891 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png index b72b053e4f..bb68ec126c 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png index bc7672e7aa..3fde6b8488 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png index 053a9c1e46..627270da41 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png index 047723cf4f..b0fa3af455 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png index b489835473..e06588eaad 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png index 83e9159716..695bc489f9 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png index cfa19a007a..f97f0a2e8a 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png index 7456850c08..3d853400ba 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png index 796eaf83b0..9751e35227 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png index 3fe117f2ac..fd3d0cd1d4 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json index 244e4e2b5b..75a87e0ab7 100644 --- a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -73,17 +73,6 @@ "name": "toxinkit-inhand-left", "directions": 4 }, - { - "name": "purplekit" - }, - { - "name": "purplekit-inhand-right", - "directions": 4 - }, - { - "name": "purplekit-inhand-left", - "directions": 4 - }, { "name": "blackkit" }, diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png index 59919b8585..53f73ffc40 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png deleted file mode 100644 index 156ac290e1..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png deleted file mode 100644 index 43b0142c89..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png deleted file mode 100644 index 778a319a01..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png index 0bab485fa9..d17de45157 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png index e0e563022a..7eb45f4191 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png index b80dd151b4..f908c97d68 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png and b/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/meta.json index d8c80a1fd6..18c65e9d89 100644 --- a/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/healing_toolbox.rsi/meta.json @@ -1,14 +1,14 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, modified further by Flareguy (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] } diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png index d386b06ff8..5cbc71950b 100644 Binary files a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json index d5c8ce7e03..d1c736ee32 100644 --- a/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/ca0a3ad6128fd40efdfb7bf3321ebac233a506bc & inhand from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09, Inhands resprited by MureixloL", + "copyright": "Made by ps3moira (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png deleted file mode 100644 index a7635656c6..0000000000 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png index 3c2f7060c0..933a7e862e 100644 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json index a9c36ac409..253cddc2c2 100644 --- a/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "box" }, - { - "name": "box-open" - }, { "name": "box-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png deleted file mode 100644 index 709ad575d2..0000000000 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png index 98791e3959..1738b3537b 100644 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json index e3c80c2ae3..253cddc2c2 100644 --- a/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "box" }, - { - "name": "box-open" - }, { "name": "box-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png deleted file mode 100644 index ab36fcca2e..0000000000 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png index 6dee8d1517..e1e04e2580 100644 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json index e3c80c2ae3..253cddc2c2 100644 --- a/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "box" }, - { - "name": "box-open" - }, { "name": "box-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png deleted file mode 100644 index 14e8a1181d..0000000000 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png index 8c0c2058c3..a014eb4d47 100644 Binary files a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png and b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json index e3c80c2ae3..253cddc2c2 100644 --- a/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "box" }, - { - "name": "box-open" - }, { "name": "box-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png b/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png index 771580750f..7c852b9c15 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png and b/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png b/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png index 5898563a40..8ac528f873 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png and b/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png b/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png index fa813fcf1c..50730fec70 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png and b/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png b/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png index 3845881241..1d6c81a97a 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png and b/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box.png b/Resources/Textures/Objects/Storage/boxes.rsi/box.png index 13a9d2c79f..5d1a0a9f13 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png index 3f7273cd3d..c208f68ead 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png deleted file mode 100644 index 699aeb7c48..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png index e8234480b2..98a129d003 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png index 3e43d363dd..314e206b7f 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png deleted file mode 100644 index 6870f573f6..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png index 4988746015..ee5104c619 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png index 5e9d416712..b7be41febd 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png b/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png index 55feaa5dae..5381061070 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png and b/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png b/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png index 9237f289fa..622bcc9a64 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png and b/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/candle.png b/Resources/Textures/Objects/Storage/boxes.rsi/candle.png index 989d5c5493..4a238f0953 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/candle.png and b/Resources/Textures/Objects/Storage/boxes.rsi/candle.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png b/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png index 846ecebbed..6e87ff462c 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png and b/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png index 343683ca64..f624551f55 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png and b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/darts.png b/Resources/Textures/Objects/Storage/boxes.rsi/darts.png index b511739cf4..0d45901457 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/darts.png and b/Resources/Textures/Objects/Storage/boxes.rsi/darts.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/disk.png b/Resources/Textures/Objects/Storage/boxes.rsi/disk.png index a94a083804..4bbc56c2ee 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/disk.png and b/Resources/Textures/Objects/Storage/boxes.rsi/disk.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png index ddfe03440d..ee80428759 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png index 8dbdf151b8..5705e71908 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png and b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png index 93d52099fc..06947d4071 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png and b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png index feda505ca8..520385e3ec 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png and b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png index bc386ddbc3..6c4e23df26 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/flare.png b/Resources/Textures/Objects/Storage/boxes.rsi/flare.png index c879d99a34..07cff902c4 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/flare.png and b/Resources/Textures/Objects/Storage/boxes.rsi/flare.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png b/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png index 1c116f0910..c7b202228c 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png and b/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png b/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png index c56dd01453..2f060ada09 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png and b/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png index f18dd0ca93..3916ae646c 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/france.png and b/Resources/Textures/Objects/Storage/boxes.rsi/france.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png index 9171aa6b91..ec4907c0bc 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png and b/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png b/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png index d19d9835ac..6881850f37 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png and b/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/headset.png b/Resources/Textures/Objects/Storage/boxes.rsi/headset.png index eb1504d811..76bcfdf203 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/headset.png and b/Resources/Textures/Objects/Storage/boxes.rsi/headset.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png index 106cc3080b..0381c8ff08 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png and b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/holo.png b/Resources/Textures/Objects/Storage/boxes.rsi/holo.png index a209c6b9dd..803c2cc92b 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/holo.png and b/Resources/Textures/Objects/Storage/boxes.rsi/holo.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/implant.png b/Resources/Textures/Objects/Storage/boxes.rsi/implant.png index df781b8d8a..3e11be9c07 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/implant.png and b/Resources/Textures/Objects/Storage/boxes.rsi/implant.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png b/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png index e8e864035d..7045b0db44 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png and b/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png index 7467121690..4a6e4da74a 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png and b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/latex.png b/Resources/Textures/Objects/Storage/boxes.rsi/latex.png index cef071839a..d501a20609 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/latex.png and b/Resources/Textures/Objects/Storage/boxes.rsi/latex.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/light.png b/Resources/Textures/Objects/Storage/boxes.rsi/light.png index 0070bb142b..95d68c447e 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/light.png and b/Resources/Textures/Objects/Storage/boxes.rsi/light.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png b/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png index 63e7c45a52..b5f556329c 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png and b/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png b/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png index 7c1aa97435..438bd70c8f 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png and b/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png b/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png index f25811df5f..af4e7810ef 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png and b/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meson.png b/Resources/Textures/Objects/Storage/boxes.rsi/meson.png index 469a2fa375..a73f90cbfb 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/meson.png and b/Resources/Textures/Objects/Storage/boxes.rsi/meson.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index d881d0ce6e..20f3c057af 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,11 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol", - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github)", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "beaker" @@ -61,21 +61,9 @@ { "name": "box_security" }, - { - "name": "box_medical" - }, { "name": "box_science" }, - { - "name": "box_olive" - }, - { - "name": "box_id" - }, - { - "name": "id" - }, { "name": "circuit" }, @@ -127,33 +115,6 @@ { "name": "magazine" }, - { - "name": "l6_base" - }, - { - "name": "l6_red" - }, - { - "name": "l6_uranium" - }, - { - "name": "shotgun_base" - }, - { - "name": "shotgun_red" - }, - { - "name": "shotgun_uranium" - }, - { - "name": "smg_base" - }, - { - "name": "smg_red" - }, - { - "name": "smg_uranium" - }, { "name": "mousetraps" }, @@ -191,12 +152,12 @@ "name": "writing_of_doom" }, { - "name": "headset" - }, + "name": "headset" + }, + { + "name": "encryptokey" + }, { - "name": "encryptokey" - }, - { "name": "inhand-left", "directions": 4 }, @@ -212,33 +173,6 @@ "name": "hug-inhand-right", "directions": 4 }, - { - "name": "shellbeanbag" - }, - { - "name": "shellflare" - }, - { - "name": "shellflash" - }, - { - "name": "shellincendiary" - }, - { - "name": "shelllethal" - }, - { - "name": "shellpractice" - }, - { - "name": "shellslug" - }, - { - "name": "shelluranium" - }, - { - "name": "shelltranquilizer" - }, { "name": "shelltoy" }, @@ -257,23 +191,11 @@ { "name": "envelope" }, - { - "name": "stinger" - }, - { - "name": "shrapnel" - }, - { - "name": "incendiary" - }, { "name": "france" }, { "name": "agrichemkit" - }, - { - "name": "facecast" - } + } ] } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png b/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png index a1fff26bbc..b777906f4e 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png and b/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png index 598d9b4c38..30042ca767 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png and b/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png index e179be543c..3df06c7402 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png and b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png b/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png index 25ff1f48d9..1947f9c71f 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png and b/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/pda.png b/Resources/Textures/Objects/Storage/boxes.rsi/pda.png index f0439d92b1..07098d77dd 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/pda.png and b/Resources/Textures/Objects/Storage/boxes.rsi/pda.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png b/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png index f21c12dcb0..6465261194 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png and b/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png index 15ce766fa4..d92a5ea120 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png deleted file mode 100644 index 231001da1b..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png deleted file mode 100644 index 816ea7e239..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png deleted file mode 100644 index 94a0bf1bae..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png deleted file mode 100644 index 64c8a61af6..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png deleted file mode 100644 index 5971af22ae..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png deleted file mode 100644 index b844b9ed56..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png deleted file mode 100644 index d3b77443fa..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png index 1b11b15195..a484f31664 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png and b/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png deleted file mode 100644 index 96990098bf..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png deleted file mode 100644 index 2a4e1dee15..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/shelluranium.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png b/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png index 8968f28c91..0a6d7fa653 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png and b/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png b/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png index 2f28c4599d..54fcb4f532 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png and b/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/swab.png b/Resources/Textures/Objects/Storage/boxes.rsi/swab.png index 87148af0d5..e9d2331a23 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/swab.png and b/Resources/Textures/Objects/Storage/boxes.rsi/swab.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png b/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png index 1f52d44ce3..c03a7b237c 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png and b/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png index 834410a43e..5841c2ff1a 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png and b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png index ad6f99403e..4697263144 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png and b/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png index 37b792c776..7f1c127ed0 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png and b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/writing.png b/Resources/Textures/Objects/Storage/boxes.rsi/writing.png index 3b6b3fab32..b985fbd375 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/writing.png and b/Resources/Textures/Objects/Storage/boxes.rsi/writing.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png b/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png index 3f15875b2c..d1e797f870 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png and b/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png b/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png index c576754267..526e3d0b6f 100644 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png and b/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png b/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png index 7bbb9eaa1d..33043ae073 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png b/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png index 756a606caf..cedd7ea59e 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/box.png b/Resources/Textures/Objects/Storage/boxicons.rsi/box.png index 0a12d0e141..ddbb198945 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/box.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/box.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png b/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png index 89ecc16cde..2f7f9eabf0 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png index f7c448ee77..357b0c15bf 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png index c6ba755256..0ceb740928 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png index 615408735d..191dd727ab 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png b/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png index 3d2f1dda56..663be2e931 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png b/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png index 3819d40b22..5ea7300f92 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png b/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png index 1e695be9d2..f26841ae47 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png b/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png index 183cd48b2d..790dd6dd6f 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png b/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png index ae5d788f8c..3f27c888ec 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/light.png b/Resources/Textures/Objects/Storage/boxicons.rsi/light.png index f16e4fdceb..1615b9cea8 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/light.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/light.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png b/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png index aab16a4557..90fd838ada 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png b/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png index b257bd68e5..b4b94775c1 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png b/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png index a124ba5d96..ba5fc1ad8c 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json index 935b0b9f8b..25e914234d 100644 --- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png b/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png index 4f9cda8b50..ecef711b6d 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png b/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png index 4c625ad354..4d7dabb541 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png b/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png index bde84ad2b3..408ade8fad 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png index 6695a14b0a..5d81fffb21 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png b/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png index 66267f50ad..da81f15b4f 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png index 60f2b86001..ebbd464f91 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png b/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png index 90872462f1..fd99b6eea3 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png index b2af7bce88..ecb3efdf3e 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png index debd093265..9979779a9b 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png index 07a428bbb4..4d8f9d1961 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png b/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png index 4c708769e8..aff2c415a3 100644 Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png differ diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png deleted file mode 100644 index c84d483006..0000000000 Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png deleted file mode 100644 index 8e81bd04f8..0000000000 Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png b/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png deleted file mode 100644 index 2dfb972cef..0000000000 Binary files a/Resources/Textures/Objects/Storage/donkpocket.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json deleted file mode 100644 index 53eb12dce1..0000000000 --- a/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png b/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png index 712d458c94..7bae81b799 100644 Binary files a/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png and b/Resources/Textures/Objects/Storage/medalcase.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json index 2d22408056..8c9647fc3e 100644 --- a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json @@ -1,17 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c", + "copyright": "Taken from Beestation-Hornet at https://github.com/BeeStation/BeeStation-Hornet/commit/d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c, modified by ps3moira (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "closed" + "name": "open" }, { - "name": "open" + "name": "closed" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/open.png b/Resources/Textures/Objects/Storage/medalcase.rsi/open.png index ed80d96b74..b9e3ac2fea 100644 Binary files a/Resources/Textures/Objects/Storage/medalcase.rsi/open.png and b/Resources/Textures/Objects/Storage/medalcase.rsi/open.png differ diff --git a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png deleted file mode 100644 index e66d0bc97c..0000000000 Binary files a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png index d4d4005179..40aa58ddc9 100644 Binary files a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png and b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json index 47e2e44ab7..4b62000f93 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", + "copyright": "@trerri#0107, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "icon" }, - { - "name": "icon-open" - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png index 44580a1226..5ae267038d 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png index f16130ef38..7e7f4c822d 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png index c335a79daa..71a43e2286 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png index 7b3b7b9846..65dd090d19 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png differ diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png index ba4af386a3..2c2bc7e35d 100644 Binary files a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json index e6723a6444..6f91126877 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json @@ -22,4 +22,4 @@ "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json index becb302333..4080552023 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json @@ -66,4 +66,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json index e6723a6444..6f91126877 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json @@ -22,4 +22,4 @@ "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json index e6723a6444..6f91126877 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json @@ -22,4 +22,4 @@ "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json index f4c473b8ca..ebc7858be9 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json @@ -22,4 +22,4 @@ "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json index 068495fb27..12106394eb 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json @@ -19,4 +19,4 @@ "name": "icon" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json index e6723a6444..6f91126877 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json @@ -22,4 +22,4 @@ "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png deleted file mode 100644 index 1bc6823aba..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png index 1f2b2fe287..d85ed4b87b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png index 6a141b7efb..6d68bae35d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png index 2414fe500b..b98a250319 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png index 1784e7f623..a39f0598d0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png deleted file mode 100644 index d68f85845e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png deleted file mode 100644 index 50ea7c47ff..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png deleted file mode 100644 index 94a2272c80..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json index b2728ab02b..942f06d0b8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi, base and mag-1 by Alekshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "base-b" - }, { "name": "mag-1" }, @@ -21,15 +18,6 @@ }, { "name": "mag-3" - }, - { - "name": "magb-1" - }, - { - "name": "magb-2" - }, - { - "name": "magb-3" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png deleted file mode 100644 index 225ec31758..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png deleted file mode 100644 index 010fae34ad..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png index 1685543539..b9cf1dcee4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png index c9f029f32a..c5e936e0ae 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png index 84725cfd32..71e225a8d1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png index 532baa546b..5bf9d3a7a7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png deleted file mode 100644 index 8b49392b77..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png deleted file mode 100644 index 80e504f560..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png deleted file mode 100644 index 0c582b01d5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png deleted file mode 100644 index 39e05c7211..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png deleted file mode 100644 index 8fd938dce0..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png deleted file mode 100644 index 6a77161ab2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json index 958aeb6f48..1cde5f0678 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,12 +10,6 @@ { "name": "base" }, - { - "name": "base-b" - }, - { - "name": "base-10x24" - }, { "name": "mag-1" }, @@ -25,32 +19,8 @@ { "name": "mag-3" }, - { - "name": "magb-1" - }, - { - "name": "magb-2" - }, - { - "name": "magb-3" - }, - { - "name": "mag10-1" - }, - { - "name": "mag10-2" - }, - { - "name": "mag10-3" - }, { "name": "practice" - }, - { - "name": "rubber" - }, - { - "name": "rubber-b" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png index 99548b3e5b..4d5e7f4cd0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png deleted file mode 100644 index cf04605a79..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png deleted file mode 100644 index 5a75c53666..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png deleted file mode 100644 index 7d578e5194..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png index ef44262042..8ee34cf21e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png index 907b6040c2..82278c4b7e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png index 36c872a426..5568c0496a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png index 025bec650e..8bc91cf1c2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png index 31c1c6b5c7..65f144082c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png deleted file mode 100644 index 39e05c7211..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png deleted file mode 100644 index 8fd938dce0..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png deleted file mode 100644 index 6a77161ab2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index ff9704e4fc..f20e7373ce 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "base-b" - }, { "name": "mag-1" }, @@ -22,24 +19,12 @@ { "name": "mag-3" }, - { - "name": "magb-1" - }, - { - "name": "magb-2" - }, - { - "name": "magb-3" - }, { "name": "incendiary" }, { "name": "practice" }, - { - "name": "rubber" - }, { "name": "uranium" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png index b252261c16..76c0d78415 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png deleted file mode 100644 index 7d8d465e63..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png index 7fefe0c6b9..bcf68ecf45 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png index 150b4b15cf..f3d3e48e28 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png deleted file mode 100644 index 63a58f01fd..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png index 153b43e441..e7112fd7ce 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png index f6fb71b69d..a63b176d00 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png index 8b7d23dc6c..6edae95812 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png index 6d2b4034e1..cb9729751e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png index 7d2bcd29ec..cb8d1d307e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png new file mode 100644 index 0000000000..e134075bcc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png new file mode 100644 index 0000000000..f75e4eba6e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png new file mode 100644 index 0000000000..247c9ac22b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json index bb09b47a52..1a54a4b636 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi. capbase and cap modified from base and rubber by potato1234x (github) for ss14, tweaked by Aleshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -23,7 +23,13 @@ "name": "mag-3" }, { - "name": "cap" + "name": "mag-cap-1" + }, + { + "name": "mag-cap-2" + }, + { + "name": "mag-cap-3" }, { "name": "incendiary" @@ -31,9 +37,6 @@ { "name": "practice" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png index 83910ba263..99bb7ee6f0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png index 7aa1004261..4d5e7f4cd0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png deleted file mode 100644 index 020a8d3851..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png index 90238cf3c2..93af337b36 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png index ac7de8b43b..c87791c07f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png index 226711c301..a63b176d00 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png index 1d8de97957..654a600e2b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png index 43d1f0f5f7..ce3c6c42ec 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png index 5d6d61f5db..7e0cce6ea5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index dd1e88cffc..1dbd2630ee 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -25,9 +25,6 @@ { "name": "practice" }, - { - "name": "rubber" - }, { "name": "uranium" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png index 6911805ffa..4d5e7f4cd0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png deleted file mode 100644 index aa5c85660a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png index 1dba694fef..93af337b36 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png deleted file mode 100644 index 9f98573eb5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png new file mode 100644 index 0000000000..50491a4174 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-big.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png index 6db2100a88..078d6717f6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png index e10d99713b..d72465db2d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png index 4d7eb62cbf..b253d1a0de 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png index 24cf3a37fb..2830c2ada0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png index 68bb5da7be..b294e3197f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png new file mode 100644 index 0000000000..fa9078d130 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png new file mode 100644 index 0000000000..991de0716e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png new file mode 100644 index 0000000000..968c3241e6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png deleted file mode 100644 index 39e05c7211..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png deleted file mode 100644 index 8fd938dce0..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png deleted file mode 100644 index 6a77161ab2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index 5c5b4eaef3..b6e5c821cc 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "base" }, { - "name": "base-b" + "name": "base-big" }, { "name": "mag-1" @@ -23,13 +23,13 @@ "name": "mag-3" }, { - "name": "magb-1" + "name": "mag-big-1" }, { - "name": "magb-2" + "name": "mag-big-2" }, { - "name": "magb-3" + "name": "mag-big-3" }, { "name": "incendiary" @@ -37,12 +37,6 @@ { "name": "practice" }, - { - "name": "practice-b" - }, - { - "name": "rubber" - }, { "name": "uranium" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png deleted file mode 100644 index 0c8f89ffc3..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png index 6d5337b8bf..04af2191cd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png deleted file mode 100644 index 1f883d1572..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png index 8dede3071e..3219da558d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png index f460615079..008a736315 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png index a2fe9e8f1d..e6f277ba84 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png index 3b65c7acbe..d734c66d19 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png index 7841707b12..554baa9424 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png index d3a282afbf..549c922495 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png index d77e6507b0..8a48bb884d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png index eaff18cf28..db541f8acb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png index 1563f21fe7..b6a01032d9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png index 9a3c99707f..a6325d2d84 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png deleted file mode 100644 index 0b8f096ef9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png deleted file mode 100644 index 81649769f4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png deleted file mode 100644 index 80505d3934..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png deleted file mode 100644 index 60be778fdf..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png new file mode 100644 index 0000000000..12b18cf8b4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png new file mode 100644 index 0000000000..e71c0f5418 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png new file mode 100644 index 0000000000..81b11d4127 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png new file mode 100644 index 0000000000..e167574f17 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png new file mode 100644 index 0000000000..2d19b37d0e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png new file mode 100644 index 0000000000..3581b4b900 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png new file mode 100644 index 0000000000..fb1c27958a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png new file mode 100644 index 0000000000..bd0804e516 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png new file mode 100644 index 0000000000..6cb866d75d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png new file mode 100644 index 0000000000..9a23c7bd0a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png new file mode 100644 index 0000000000..d7e2b98a72 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png new file mode 100644 index 0000000000..13003e77fb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png new file mode 100644 index 0000000000..cdb6cc85fa Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png new file mode 100644 index 0000000000..876f61936f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png new file mode 100644 index 0000000000..138dd64b31 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png new file mode 100644 index 0000000000..2dfd5a4beb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png new file mode 100644 index 0000000000..fb6e50a80b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png new file mode 100644 index 0000000000..73135e3f3b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png new file mode 100644 index 0000000000..2a5e3541d0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png new file mode 100644 index 0000000000..08bc0fb1fc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png new file mode 100644 index 0000000000..48518c8557 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png new file mode 100644 index 0000000000..c7738a23b6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png new file mode 100644 index 0000000000..563dc39ccb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png new file mode 100644 index 0000000000..abb6a10c68 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png new file mode 100644 index 0000000000..7f8e0d839e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png new file mode 100644 index 0000000000..4b23d08f91 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png new file mode 100644 index 0000000000..85f6f4bcfb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png new file mode 100644 index 0000000000..7c1d53e831 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json index 3df588a845..b09d33fb11 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by SpaceRox1244", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", "size": { "x": 32, "y": 32 @@ -23,16 +23,88 @@ "name": "mag-4" }, { - "name": "mag-alt-1" + "name": "mag-beanbag-1" }, { - "name": "mag-alt-2" + "name": "mag-beanbag-2" }, { - "name": "mag-alt-3" + "name": "mag-beanbag-3" }, { - "name": "mag-alt-4" + "name": "mag-beanbag-4" + }, + { + "name": "mag-slug-1" + }, + { + "name": "mag-slug-2" + }, + { + "name": "mag-slug-3" + }, + { + "name": "mag-slug-4" + }, + { + "name": "mag-practice-1" + }, + { + "name": "mag-practice-2" + }, + { + "name": "mag-practice-3" + }, + { + "name": "mag-practice-4" + }, + { + "name": "mag-tranq-1" + }, + { + "name": "mag-tranq-2" + }, + { + "name": "mag-tranq-3" + }, + { + "name": "mag-tranq-4" + }, + { + "name": "mag-uranium-1" + }, + { + "name": "mag-uranium-2" + }, + { + "name": "mag-uranium-3" + }, + { + "name": "mag-uranium-4" + }, + { + "name": "mag-flare-1" + }, + { + "name": "mag-flare-2" + }, + { + "name": "mag-flare-3" + }, + { + "name": "mag-flare-4" + }, + { + "name": "mag-incend-1" + }, + { + "name": "mag-incend-2" + }, + { + "name": "mag-incend-3" + }, + { + "name": "mag-incend-4" }, { "name": "lethal" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png index 4ece8a0c1e..1bf826775b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png index b55085e398..c8fe67cce6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png index 373d6a2a0c..fdd3b5e5d2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png index 03a0244fda..7da6702f43 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index 8aa221dcb7..296090da5d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "red-icon" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png deleted file mode 100644 index ef8982b1b7..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json index 1d75c67608..71fb04b7f3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "red" }, - { - "name": "rubber" - }, { "name": "mag-1" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png deleted file mode 100644 index f7aadbfcb8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json index 1d75c67608..71fb04b7f3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "red" }, - { - "name": "rubber" - }, { "name": "mag-1" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png deleted file mode 100644 index bbc6047d61..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json index 40eaed0198..082b2586f5 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "red" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png deleted file mode 100644 index f0e9a5c516..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index 15964feef9..b766264c79 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "red" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png deleted file mode 100644 index 9cde22c568..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index a01c6d97bc..aa11185ac3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "red" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png deleted file mode 100644 index ad77f0f126..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json index 77af40592a..1aed17caca 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "red-icon" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png deleted file mode 100644 index 8be70a07ea..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 8269fa0841..4ece1ce6c3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "red-icon" }, - { - "name": "rubber" - }, { "name": "uranium" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png deleted file mode 100644 index fedefaba13..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index a94453eb74..4aff585ea3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -49,24 +49,6 @@ { "name": "practice-6" }, - { - "name": "rubber-1" - }, - { - "name": "rubber-2" - }, - { - "name": "rubber-3" - }, - { - "name": "rubber-4" - }, - { - "name": "rubber-5" - }, - { - "name": "rubber-6" - }, { "name": "uranium-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png deleted file mode 100644 index d4ee09b545..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png deleted file mode 100644 index 1f3b9965b1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png deleted file mode 100644 index 9724498cc8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png deleted file mode 100644 index bef55e248b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png deleted file mode 100644 index 052192ed04..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png deleted file mode 100644 index e33105c761..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json index 89bc20ad9a..6aab220483 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -45,24 +45,6 @@ }, { "name": "practice-6" - }, - { - "name": "rubber-1" - }, - { - "name": "rubber-2" - }, - { - "name": "rubber-3" - }, - { - "name": "rubber-4" - }, - { - "name": "rubber-5" - }, - { - "name": "rubber-6" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png deleted file mode 100644 index 31620f5e13..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png deleted file mode 100644 index dca283caf9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png deleted file mode 100644 index 5c5a433317..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png deleted file mode 100644 index 9bb14be661..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png deleted file mode 100644 index a52d8764c1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png deleted file mode 100644 index 714473f24c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png and /dev/null differ