From 00fbdead77e16f443d6d9d2f0d74fdd9ae674b89 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Fri, 9 Aug 2024 12:36:35 +0000 Subject: [PATCH] Modules update (#596) * - add: Update module sprites. * - add: Modules update. --- .../WeaponModules/WeaponModulesSystem.cs | 10 +-- .../ru-RU/locales-new/autotranslate-57.ftl | 9 +- .../Catalog/Fills/Lockers/heads.yml | 1 - .../Catalog/Fills/Lockers/security.yml | 4 - .../Objects/Weapons/Guns/Rifles/rifles.yml | 4 - .../Objects/Weapons/Guns/SMGs/smgs.yml | 14 +--- .../Entities/Structures/Machines/lathe.yml | 24 +++--- .../Prototypes/Procedural/salvage_loot.yml | 4 + .../Prototypes/Recipes/Lathes/categories.yml | 5 ++ .../Prototypes/Recipes/Lathes/security.yml | 59 ++++++++----- .../Objects/Weapons/Guns/Modules/modules.yml | 79 ++++++++---------- .../Prototypes/_White/Research/arsenal.yml | 27 ++++++ .../Rifles/ak-icons.rsi/barrel_module.png | Bin 0 -> 202 bytes .../Rifles/ak-icons.rsi/handguard_module.png | Bin 0 -> 256 bytes .../Guns/Rifles/ak-icons.rsi/meta.json | 21 +++++ .../Rifles/lecter-icons.rsi/barrel_module.png | Bin 0 -> 193 bytes .../lecter-icons.rsi/handguard_module.png | Bin 0 -> 255 bytes .../Guns/Rifles/lecter-icons.rsi/meta.json | 21 +++++ .../Guns/SMG/c20r-icons.rsi/barrel_module.png | Bin 0 -> 207 bytes .../SMG/c20r-icons.rsi/handguard_module.png | Bin 0 -> 249 bytes .../Weapons/Guns/SMG/c20r-icons.rsi/meta.json | 18 ++++ .../SMG/drozd-icons.rsi/barrel_module.png | Bin 0 -> 207 bytes .../SMG/drozd-icons.rsi/handguard_module.png | Bin 0 -> 253 bytes .../Guns/SMG/drozd-icons.rsi/meta.json | 24 +++++- .../SMG/wt550-icons.rsi/barrel_module.png | Bin 0 -> 210 bytes .../SMG/wt550-icons.rsi/handguard_module.png | Bin 0 -> 258 bytes .../Guns/SMG/wt550-icons.rsi/meta.json | 21 +++++ .../{eightaim.png => holographic.png} | Bin .../Objects/Weapons/modules.rsi/meta.json | 7 +- .../Weapons/modules.rsi/telescopic.png | Bin 0 -> 2789 bytes .../Weapons/modulesOnSMGs.rsi/aim_module.png | Bin 157 -> 161 bytes .../Weapons/modulesOnSMGs.rsi/holographic.png | Bin 0 -> 161 bytes .../Weapons/modulesOnSMGs.rsi/meta.json | 26 +----- .../Weapons/modulesOnSMGs.rsi/telescopic.png | Bin 0 -> 183 bytes .../modulesOnWeapon.rsi/aim_module.png | Bin 157 -> 161 bytes .../modulesOnWeapon.rsi/holographic.png | Bin 0 -> 161 bytes .../Weapons/modulesOnWeapon.rsi/meta.json | 26 +----- .../modulesOnWeapon.rsi/telescopic.png | Bin 0 -> 178 bytes .../accelerator.png | Bin .../aim_module.png} | Bin .../barrel_module.png | Bin .../eightaim.png | Bin .../flamehider.png | Bin .../handguard_module.png | Bin .../laser.png | Bin .../light.png | Bin .../Weapons/modulesOnWeaponOld.rsi/meta.json | 38 +++++++++ .../silencer.png | Bin .../accelerator.png | Bin .../moulesOnSMGsOld.rsi/aim_module.png | Bin 0 -> 157 bytes .../barrel_module.png | Bin .../Weapons/moulesOnSMGsOld.rsi/eightaim.png | Bin 0 -> 157 bytes .../flamehider.png | Bin .../handguard_module.png | Bin .../laser.png | Bin .../light.png | Bin .../Weapons/moulesOnSMGsOld.rsi/meta.json | 38 +++++++++ .../silencer.png | Bin 58 files changed, 329 insertions(+), 151 deletions(-) create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/barrel_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/handguard_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/barrel_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/handguard_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/barrel_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/handguard_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/barrel_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/handguard_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/barrel_module.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/handguard_module.png rename Resources/Textures/White/Objects/Weapons/modules.rsi/{eightaim.png => holographic.png} (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/modules.rsi/telescopic.png create mode 100644 Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/holographic.png create mode 100644 Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/telescopic.png create mode 100644 Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/holographic.png create mode 100644 Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/telescopic.png rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => modulesOnWeaponOld.rsi}/accelerator.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi/eightaim.png => modulesOnWeaponOld.rsi/aim_module.png} (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => modulesOnWeaponOld.rsi}/barrel_module.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => modulesOnWeaponOld.rsi}/eightaim.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => modulesOnWeaponOld.rsi}/flamehider.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => modulesOnWeaponOld.rsi}/handguard_module.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => modulesOnWeaponOld.rsi}/laser.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => modulesOnWeaponOld.rsi}/light.png (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/meta.json rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => modulesOnWeaponOld.rsi}/silencer.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => moulesOnSMGsOld.rsi}/accelerator.png (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/aim_module.png rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => moulesOnSMGsOld.rsi}/barrel_module.png (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/eightaim.png rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => moulesOnSMGsOld.rsi}/flamehider.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => moulesOnSMGsOld.rsi}/handguard_module.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => moulesOnSMGsOld.rsi}/laser.png (100%) rename Resources/Textures/White/Objects/Weapons/{modulesOnWeapon.rsi => moulesOnSMGsOld.rsi}/light.png (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/meta.json rename Resources/Textures/White/Objects/Weapons/{modulesOnSMGs.rsi => moulesOnSMGsOld.rsi}/silencer.png (100%) diff --git a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs index db0fe124ad..c0ce50153b 100644 --- a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs +++ b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Shared._White.Telescope; using Content.Shared._White.WeaponModules; using Content.Shared.Weapons.Ranged.Components; @@ -128,7 +128,7 @@ public sealed class WeaponModulesSystem : EntitySystem return; weaponModulesComponent.WeaponFireEffect = true; - Dirty(module, weaponModulesComponent); + Dirty(weapon, weaponModulesComponent); } private void SilencerModuleOnInsert(EntityUid module, SilencerModuleComponent component, EntGotInsertedIntoContainerMessage args) @@ -145,7 +145,7 @@ public sealed class WeaponModulesSystem : EntitySystem weaponModulesComponent.WeaponFireEffect = true; _gunSystem.SetSound(weapon, component.NewSoundGunshot); - Dirty(module, weaponModulesComponent); + Dirty(weapon, weaponModulesComponent); } private void AcceleratorModuleOnInsert(EntityUid module, AcceleratorModuleComponent component, EntGotInsertedIntoContainerMessage args) @@ -224,7 +224,7 @@ public sealed class WeaponModulesSystem : EntitySystem return; weaponModulesComponent.WeaponFireEffect = false; - Dirty(module, weaponModulesComponent); + Dirty(weapon, weaponModulesComponent); } private void SilencerModuleOnEject(EntityUid module, SilencerModuleComponent component, EntGotRemovedFromContainerMessage args) @@ -236,7 +236,7 @@ public sealed class WeaponModulesSystem : EntitySystem weaponModulesComponent.WeaponFireEffect = false; _gunSystem.SetSound(weapon, component.OldSoundGunshot!); - Dirty(module, weaponModulesComponent); + Dirty(weapon, weaponModulesComponent); } private void AcceleratorModuleOnEject(EntityUid module, AcceleratorModuleComponent component, EntGotRemovedFromContainerMessage args) diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl index b280261f02..4ba0e2440a 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl @@ -8,4 +8,11 @@ ent-SilencerModule = глушитель .desc = Скрывает пламя огня и приглушает звук во время выстрела. ent-AcceleratorModule = продвинутый модуль .desc = Разработка NanoTrasen специально для отдела Службы Безопасности. Меняет затворную раму без видимых изменений, за счет этого увеличивает скорострельность оружия. -gun-modules = Установленные модули: [color=cyan]{ $modules }[/color]. \ No newline at end of file +ent-HolographicSightModule = голографической прицел + .desc = Позоляет целиться, небольшое приближение. +ent-TelescopicSightModule = телескопический прицел + .desc = Позоляет целиться, большое приближение. +gun-modules = Установленные модули: [color=cyan]{ $modules }[/color]. +research-technology-modules-basic = Базовые модули +research-technology-modules-advanced = Продвинутые модули +lathe-category-modules = Модули diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 65ee4df28b..1c0cffcd4d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -287,7 +287,6 @@ - id: MagazinePistol - id: BoxMindshield - id: TagillaHammer - - id: EightAimModule - type: entity id: LockerFreezerVaultFilled suffix: Vault, Locked diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index c20e61ccb1..f511287eba 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -18,7 +18,6 @@ - id: BoxMindshield - id: ClothingOuterHardsuitWarden - id: OxygenTankFilled - - id: LightModule - id: WeaponLauncherShinano - id: BoxShinanoGrenadeFlash - id: BoxShinanoGrenadeSmoke @@ -43,7 +42,6 @@ - id: WeaponPistolMk58Nonlethal - id: MagazinePistol - id: BoxMindshield - - id: LightModule - id: WeaponLauncherShinano - id: BoxShinanoGrenadeFlash - id: BoxShinanoGrenadeSmoke @@ -77,7 +75,6 @@ - id: WeaponPistolMk58Nonlethal - id: SurveillanceBodyCamera - id: MagazinePistol - - id: LightModule - type: entity id: LockerBrigmedicFilled @@ -141,7 +138,6 @@ - id: VoiceRecorder - id: ClothingEyesGlassesSecurity - id: BoxZipLocks - - id: LightModule - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c2c458ca3e..2f85313c12 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -76,11 +76,9 @@ map: [ "enum.GunVisualLayers.Mag" ] - state: barrel_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.BarrelModule" ] - state: handguard_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] - state: aim_module visible: false @@ -214,11 +212,9 @@ map: [ "enum.GunVisualLayers.Mag" ] - state: barrel_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.BarrelModule" ] - state: handguard_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] - state: aim_module visible: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index ec298361e1..4afa56ac7a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,7 +20,7 @@ maxAngle: 16 fireRate: 8 angleIncrease: 3 - angleDecay: 16 + angleDecay: 16 selectedMode: FullAuto availableModes: - SemiAuto @@ -106,11 +106,9 @@ map: ["enum.GunVisualLayers.Mag"] - state: barrel_module visible: false - sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.BarrelModule" ] - state: handguard_module visible: false - sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] - state: aim_module visible: false @@ -204,15 +202,13 @@ map: ["enum.GunVisualLayers.Mag"] - state: barrel_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.BarrelModule" ] - state: handguard_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] - state: aim_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi + sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi @@ -352,15 +348,13 @@ shader: unshaded - state: barrel_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.BarrelModule" ] - state: handguard_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] - state: aim_module visible: false - sprite: White/Objects/Weapons/modulesOnWeapon.rsi + sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi @@ -373,7 +367,7 @@ minAngle: 1 maxAngle: 6 angleIncrease: 1.5 - angleDecay: 6 + angleDecay: 6 selectedMode: FullAuto shotsPerBurst: 5 availableModes: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index af279881f5..6cafa010a9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -196,11 +196,8 @@ - MagazineBoxRifle - MagazineBoxLightRifle - GrenadeBlast - - LightModuleRecipe - - LaserModuleRecipe - - FlameHiderModuleRecipe - - SilencerModuleRecipe - - AcceleratorModuleRecipe + - LightModule + - FlameHiderModule - ShinanoGrenadeBeanbagRecipe emagDynamicRecipes: - CartridgePistolRubber @@ -235,6 +232,11 @@ - MagazineGrenadeEmpty - GrenadeEMP - GrenadeFlash + - SilencerModule + - LaserModule + - AcceleratorModule + - HolographicSightModule + - TelescopicSightModule - type: BluespaceStorage - type: entity @@ -734,11 +736,8 @@ - ShellShotgunPractice - WeaponLaserCarbinePractice - WeaponDisablerPractice - - LightModuleRecipe - - LaserModuleRecipe - - FlameHiderModuleRecipe - - SilencerModuleRecipe - - AcceleratorModuleRecipe + - LightModule + - FlameHiderModule - ShinanoGrenadeBeanbagRecipe dynamicRecipes: - CartridgeLightRifleIncendiary @@ -799,6 +798,11 @@ - ShinanoGrenadeFlashRecipe - ShinanoGrenadeSmokeRecipe - ShinanoGrenadeStingerRecipe + - SilencerModule + - LaserModule + - AcceleratorModule + - HolographicSightModule + - TelescopicSightModule - type: EmagLatheRecipes emagStaticRecipes: - MagazineLightRifleBox diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index e24591becd..58dc5cea8e 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -200,12 +200,16 @@ cost: 3 - proto: LaserModule cost: 8 + - proto: HolograpicSightModule + cost: 8 - proto: FlameHiderModule cost: 3 - proto: SilencerModule cost: 5 - proto: AcceleratorModule cost: 12 + - proto: TelescopicSightModule + cost: 12 - proto: MedkitFilled cost: 3 - proto: MedkitRadiationFilled diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index 8faa67af1b..f3286e9705 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -29,3 +29,8 @@ - type: latheCategory id: Weapons name: lathe-category-weapons + +# WD +- type: latheCategory + id: Modules + name: lathe-category-modules diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 692d097189..1405657a80 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -659,43 +659,48 @@ Silver: 50 - type: latheRecipe - id: LightModuleRecipe + id: LightModule result: LightModule - completetime: 5 + completetime: 3 + category: Modules materials: - Steel: 700 - Plastic: 700 - Glass: 500 + Steel: 200 + Plastic: 100 + Glass: 200 - type: latheRecipe - id: LaserModuleRecipe + id: LaserModule result: LaserModule - completetime: 10 + completetime: 6 + category: Modules materials: Steel: 1500 Plastic: 1000 Glass: 300 - type: latheRecipe - id: FlameHiderModuleRecipe + id: FlameHiderModule result: FlameHiderModule - completetime: 15 + completetime: 3 + category: Modules materials: - Steel: 1000 - Plastic: 1000 + Steel: 200 + Plastic: 200 - type: latheRecipe - id: SilencerModuleRecipe + id: SilencerModule result: SilencerModule - completetime: 15 + completetime: 6 + category: Modules materials: - Steel: 1000 - Plastic: 1000 + Steel: 400 + Plastic: 300 - type: latheRecipe - id: AcceleratorModuleRecipe + id: AcceleratorModule result: AcceleratorModule - completetime: 30 + completetime: 12 + category: Modules materials: Steel: 3500 Plastic: 1000 @@ -703,10 +708,22 @@ Gold: 1000 - type: latheRecipe - id: EightAimRecipe - result: EightAimModule - completetime: 15 + id: HolographicSightModule + result: HolographicSightModule + completetime: 6 + category: Modules materials: Steel: 500 Plastic: 700 - Glass: 300 \ No newline at end of file + Glass: 300 + +- type: latheRecipe + id: TelescopicSightModule + result: TelescopicSightModule + completetime: 12 + category: Modules + materials: + Steel: 1000 + Plastic: 1400 + Glass: 600 + Silver: 800 diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml index 97414b17cc..7a25b54b37 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml @@ -1,70 +1,50 @@ - type: entity parent: BaseItem + id: BaseModule + abstract: true + components: + - type: Sprite + sprite: White/Objects/Weapons/modules.rsi + - type: Item + sprite: White/Objects/Weapons/modules.rsi + size: Tiny + - type: Appearance + +- type: entity + parent: BaseModule id: BaseHandGuardModule abstract: true components: - - type: Sprite - sprite: White/Objects/Weapons/modules.rsi - type: Tag tags: - BaseHandGuardModule - - type: Item - sprite: White/Objects/Weapons/modules.rsi - size: Small - shape: - - 0,0,0,0 - - type: Appearance - type: entity - parent: BaseItem + parent: BaseModule id: BaseBarrelModule abstract: true components: - - type: Sprite - sprite: White/Objects/Weapons/modules.rsi - type: Tag tags: - BaseBarrelModule - - type: Item - sprite: White/Objects/Weapons/modules.rsi - size: Small - shape: - - 0,0,0,0 - - type: Appearance - type: entity - parent: BaseItem + parent: BaseModule id: BaseAimModule abstract: true components: - - type: Sprite - sprite: White/Objects/Weapons/modules.rsi - type: Tag tags: - BaseAimModule - - type: Item - sprite: White/Objects/Weapons/modules.rsi - size: Small - shape: - - 0,0,0,0 - - type: Appearance - type: entity - parent: BaseItem + parent: BaseModule id: BaseShutterModule abstract: true components: - - type: Sprite - sprite: White/Objects/Weapons/modules.rsi - type: Tag tags: - BaseShutterModule - - type: Item - sprite: White/Objects/Weapons/modules.rsi - size: Small - shape: - - 0,0,0,0 - - type: Appearance # modules - type: entity @@ -78,7 +58,6 @@ module_type: "handguard_module" - type: Sprite state: light - - type: Appearance - type: entity parent: BaseHandGuardModule @@ -91,7 +70,6 @@ module_type: "handguard_module" - type: Sprite state: laser - - type: Appearance - type: entity parent: BaseBarrelModule @@ -104,7 +82,6 @@ module_type: "barrel_module" - type: Sprite state: flamehider - - type: Appearance - type: entity parent: BaseBarrelModule @@ -117,7 +94,6 @@ module_type: "barrel_module" - type: Sprite state: silencer - - type: Appearance - type: entity parent: BaseHandGuardModule @@ -130,20 +106,31 @@ module_type: "handguard_module" - type: Sprite state: accelerator - - type: Appearance - type: entity parent: BaseAimModule - id: EightAimModule - name: "aim module" - description: 8X Aim Module for rifles. + id: HolographicSightModule + name: "holographic sight" + description: Holographic sight for rifles (lecter, CV, drozd, WT). components: - type: AimModule - value: "eightaim" + value: "holographic" module_type: "aim_module" - type: Sprite - state: eightaim - - type: Appearance + state: holographic + +- type: entity + parent: BaseAimModule + id: TelescopicSightModule + name: "telescopic sight" + description: Telescopic sight for rifles (lecter, CV, drozd, WT). + components: + - type: AimModule + divisor: 0.15 + value: "telescopic" + module_type: "aim_module" + - type: Sprite + state: telescopic - type: entity parent: BaseShutterModule diff --git a/Resources/Prototypes/_White/Research/arsenal.yml b/Resources/Prototypes/_White/Research/arsenal.yml index 2cd1580ef0..4a48dc6e55 100644 --- a/Resources/Prototypes/_White/Research/arsenal.yml +++ b/Resources/Prototypes/_White/Research/arsenal.yml @@ -9,3 +9,30 @@ cost: 7500 recipeUnlocks: - WeaponTempGun + +- type: technology + id: BasicModules + name: research-technology-modules-basic + icon: + sprite: White/Objects/Weapons/modules.rsi + state: laser + discipline: Arsenal + tier: 1 + cost: 5000 + recipeUnlocks: + - LaserModule + - SilencerModule + - HolographicSightModule + +- type: technology + id: AdvancedModules + name: research-technology-modules-advanced + icon: + sprite: White/Objects/Weapons/modules.rsi + state: accelerator + discipline: Arsenal + tier: 2 + cost: 15000 + recipeUnlocks: + - AcceleratorModule + - TelescopicSightModule diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/barrel_module.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c7b0f19e5e60ed02621951ccbeb375ce94f9f6 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>TX z)5S3)qV?@HL#_q`0hf!t9GOkM9cthA_dSz%dH7qldIv|-(G3Rcy;uEoRXBL&$Yw^{ z2l{La3>kVEGk6@58D{-%5VU=;I`v-8*`HR^CoO%~KEGj|)}>pI?J9oy9iNfsynM=% s)xS6^9{&?GhUt-Fz97+XjA4tgP=}c1my2dbKzA^By85}Sb4q9e05NAs^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/handguard_module.png new file mode 100644 index 0000000000000000000000000000000000000000..b6877b66f6fcf0c87d83f3e88a6057e4958e0082 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<63 zr;B4qMC;q@wtS3^673(;UAEhKIXQc{EG=Z{G`48ydi>_#j>cZUh`aAhw6zyUdoB8r zKKXmNukrgcm(T7HU@E;95dR=vY(W}h7J}HypRtOsZ&BXYK6(FTb0!Njr2Z^%eYk&~ zGB-oUR%-^HU$*ZuyUrVL>wlQ|K8+zqY_alzD%1M>uE%$u^JF%hH)hbg9=(-q+Ws>I k-;{+nGnjG*Ac$(lADdO9l2-2&1G=8U)78&qol`;+03GLDJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json index 5c4c44603e..1eb85372fe 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json @@ -18,6 +18,27 @@ }, { "name": "mag-0" + }, + { + "name": "silencer" + }, + { + "name": "light" + }, + { + "name": "laser" + }, + { + "name": "flamehider" + }, + { + "name": "accelerator" + }, + { + "name": "barrel_module" + }, + { + "name": "handguard_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/barrel_module.png new file mode 100644 index 0000000000000000000000000000000000000000..36be03b803f05258da618b803620532da96ebc71 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Tp z)5S3)qV?@HL#_q`0hfy|ExBURp6}|nKhV6Ul(AGHqDJglsHgdUjwNm`Cvz6E|5?f~ ziz$O^fo8)phNxc+Q{_HPoq7CO-Tm*^P8qt*YY2Mw!u$Q_n9ViI&;BXQnAKqZQhp;$ dIaFU6lSeGSy3CfiuR!Y=JYD@<);T3K0RRX~L{5g=;@iQ8<`ggyO|fyo;Y!}v~266 z*`DWu=RQ+;{`Os|BFn2a3+*1ni!DfF%t8>pUl|z!ujtM{^7!PG(?3}p0{6ts`@Mem zR1SuWt=0@Yzij0^o6ZMqJO428eHufK*ka`aRi^)Sj(%Kc#AxTuxZ~ctr#w3KZ!Ldc l=!k5X#kvAPT(x_^YjapNDtFnLXF$g@c)I$ztaD0e0s!Y~Vub(z literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json index 310bf70cca..f4a75a3e82 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json @@ -18,6 +18,27 @@ }, { "name": "mag-0" + }, + { + "name": "silencer" + }, + { + "name": "light" + }, + { + "name": "laser" + }, + { + "name": "flamehider" + }, + { + "name": "accelerator" + }, + { + "name": "barrel_module" + }, + { + "name": "handguard_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/barrel_module.png new file mode 100644 index 0000000000000000000000000000000000000000..0f58832e98ce68b452bfdc0bb0a4ed6e96e7486e GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W>Ti z)5S3)qV?@HN3I412A7M5whb);RsUayhU_d;m33T-U#qA^JVL?OX&Le&1PvwX&eK?vZMD`Y<+ii zMbM^9qX*sZgTe~DWM4fe+^9h literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/handguard_module.png new file mode 100644 index 0000000000000000000000000000000000000000..581046029bbd95d182b0bb0a1c2dd7a0b527975e GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6b zr;B4qMC;q@wtS3%B5e=9cjf(=($Y4e!z-ClD0>6L+@qVA7YVzW8=pOKVug?U;vYVr zY_Dee72SJxFJPK#>9qj)58CW2EFI1=X7L3SH_T$bGV2xdy+tdcZM%<8)_i_huwhX} zo6UKTi z)5S3)qV?@HL#_h~JgpBSxbzNgeerkw5g=;@iQ8<~aY8tj^RyQe4Su7;<` ze9v>ibDya^*X`$43`pnw%D8_MgDH2wW+YUJ>86>_`-?=O@KRrkO@Zo!B8E)vfxi@^x`WM&rSoV)+!+B!{z3b7Y%%}6q=I))6 jB(@-pF$+qB{caFTW z)5S3)qV?@{L#_h~JgpBSxbzNgeerkwte7qcHuN!+oMtZj!nijn#DCS{xoKwl3M)@dEH01pn)Z9oGgcGhiBa+253Tv% zC{bDw5i}Jj{~-JHekYa%$_%oMFQCTg@>ejt`50H}bAK5UAbp?XBYPTTrYop@@-TUt!pPW)$!lZD1zTW9S z*FS6VGh}SFX5jf{`>wFZUwB*p!^HP#3^`(pl@C;z*5`8_zPmhf62p8ohM0BRi+FYF nXFh%7u9n7_CAI)Td}I1JOEoI*l;0ts`x!i4{an^LB{Ts5rjTIO literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json index 7fad013ea2..df8de1246d 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json @@ -45,6 +45,27 @@ }, { "name": "mag-unshaded-4" + }, + { + "name": "silencer" + }, + { + "name": "light" + }, + { + "name": "laser" + }, + { + "name": "flamehider" + }, + { + "name": "accelerator" + }, + { + "name": "barrel_module" + }, + { + "name": "handguard_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modules.rsi/holographic.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png rename to Resources/Textures/White/Objects/Weapons/modules.rsi/holographic.png diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json index 30eee566b9..f2c047d4fb 100644 --- a/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json @@ -12,7 +12,7 @@ }, { "name": "laser" - }, + }, { "name": "flamehider" }, @@ -23,7 +23,10 @@ "name": "accelerator" }, { - "name": "eightaim" + "name": "holographic" + }, + { + "name": "telescopic" }, { "name": "barrel_module" diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modules.rsi/telescopic.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b8a9ef828c7b3043c7ce8a4981db105aabca17 GIT binary patch literal 2789 zcmVuJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%AEpSzmPmT9*SF6bD5dyw>QrkD|GPzltL)LBnE?QD r&M>oS%p|?vFL$?!H!Bhm5fK?3qv{}yQxIsQ00000NkvXXu0mjf!yaba literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png index a57a22c9536fe17c68a43523e49ee6c56d14147b..d40afe6a283131ca6674639b97323f13ff68c150 100644 GIT binary patch delta 98 zcmbQsxR6n?Gr-TCmrII^fq{Y7)59eQNE-mL0tYjYOy=U&o2ckvq3r467-G?zoFKva xh4IXiRp}~$?443G6dT&4+zx6;usTaKF#LYSVDojF-wvQQ22WQ%mvv4FO#mA_85jTn delta 94 zcmZ3;IG0heGr-TCmrII^fq{Y7)59eQNGpIa2Q!d#S<-cEqN0b1yr+v}h(&L5g2c9l si4$y;8AYdPCA2VbiS#rD8f;)-@K9%v+~^)&1k}Rd>FVdQ&MBb@0NM=}*8l(j diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/holographic.png new file mode 100644 index 0000000000000000000000000000000000000000..d40afe6a283131ca6674639b97323f13ff68c150 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3-pmxw!R!6k~CayA#8@b22Z19Ekv*5LX~= zZe~?lQYk4RwMr_>C^hBhg;gBlX7&e9AFzh5!fe4XaE1E`$A)78&qol`;+ E0Eo{oBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json index 760506a2c5..11b7fc66e7 100644 --- a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json @@ -1,35 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by CaypenNow", + "copyright": "made by Aviu", "size": { - "x": 32, + "x": 48, "y": 32 }, "states": [ { - "name": "flamehider" + "name": "holographic" }, { - "name": "silencer" - }, - { - "name": "light" - }, - { - "name": "laser" - }, - { - "name": "accelerator" - }, - { - "name": "eightaim" - }, - { - "name": "handguard_module" - }, - { - "name": "barrel_module" + "name": "telescopic" }, { "name": "aim_module" diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/telescopic.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5b21537dab19e5e0965649e88bba4cd37b361a GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3-pmxw!R!6k~CayA#8@b22Z19Ekv*5LX~= zZe~?lQYk4RwMFVdQ&MBb@0NM=}*8l(j diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/holographic.png new file mode 100644 index 0000000000000000000000000000000000000000..6fcdbcbced82460255d825c32e42c9862f9b0bdd GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3-pmxw!R!6k~CayA#8@b22Z19Ekv*5LX~= zZe~?lQYk4RwMr_>C^1`}(ygBlX7$}9{FD=HY&6WCiyfyx;?UHx3vIVCg! E09%VJvj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json index a095f38ac6..11b7fc66e7 100644 --- a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json @@ -1,35 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by CaypenNow", + "copyright": "made by Aviu", "size": { - "x": 32, + "x": 48, "y": 32 }, "states": [ { - "name": "laser" + "name": "holographic" }, { - "name": "light" - }, - { - "name": "flamehider" - }, - { - "name": "silencer" - }, - { - "name": "accelerator" - }, - { - "name": "eightaim" - }, - { - "name": "handguard_module" - }, - { - "name": "barrel_module" + "name": "telescopic" }, { "name": "aim_module" diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/telescopic.png new file mode 100644 index 0000000000000000000000000000000000000000..bef8e611f4d27c54d72d801f14ea2f78c8c8a1a3 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3-pmxw!R!6k~CayA#8@b22Z19Ekv*5LX~= zZe~?lQYk4RwMCZ9Du0tZgHtYPcm3rjLJFy7pBhe@Tg*53zMuy8% W8L~PzTs;KT&*16m=d#Wzp$Py*5jQdb literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/accelerator.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/accelerator.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/accelerator.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/aim_module.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/aim_module.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/barrel_module.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/barrel_module.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/barrel_module.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/eightaim.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/eightaim.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/flamehider.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/flamehider.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/flamehider.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/handguard_module.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/handguard_module.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/handguard_module.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/laser.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/laser.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/laser.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/light.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/light.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/light.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/light.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/meta.json new file mode 100644 index 0000000000..a095f38ac6 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by CaypenNow", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "laser" + }, + { + "name": "light" + }, + { + "name": "flamehider" + }, + { + "name": "silencer" + }, + { + "name": "accelerator" + }, + { + "name": "eightaim" + }, + { + "name": "handguard_module" + }, + { + "name": "barrel_module" + }, + { + "name": "aim_module" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/silencer.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/silencer.png rename to Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/silencer.png diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/accelerator.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/accelerator.png rename to Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/accelerator.png diff --git a/Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/aim_module.png new file mode 100644 index 0000000000000000000000000000000000000000..a57a22c9536fe17c68a43523e49ee6c56d14147b GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|Bm#UwT!FN? znN?{?rKE(^GASu9FRxk#h7B7wEKKoQ43y(23GxeO`2YX^kN^K~ycNIs04OH!>Eak- z(VLtgv8`d^1RG^W(J5L9Eeu>DJxzfI8yFZo)EOiEak- z(VLtgv8`d^1RG^W(J5L9Eeu>DJxzfI8yFZo)EOi