diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 4dbe68fc2f..7183ffec13 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -801,6 +801,7 @@ id: WeaponEgun description: Egun components: + - type: WeaponModules - type: Sprite sprite: Objects/Weapons/Guns/Battery/egun.rsi layers: @@ -812,6 +813,10 @@ - state: mag-twomode2-4 map: ["enum.GunVisualLayers.TwoModeSecond"] shader: unshaded + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnEGUN.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/Battery/egun.rsi quickEquip: false @@ -842,3 +847,16 @@ size: Large shape: - 0, 0, 3, 1 + - type: ItemSlots + slots: + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - HolographicAimModule + - type: ContainerContainer + containers: + aim_module: !type:ContainerSlot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 49a65828d6..b1f273976b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -304,12 +304,22 @@ description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. components: - type: Sprite - sprite: Objects/Weapons/Guns/Pistols/N1984.rsi + sprite: White/Objects/Weapons/Guns/Pistols/N1984.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - state: barrel_module + visible: false + map: [ "enum.ModuleVisualState.BarrelModule" ] + - state: handguard_module + visible: false + map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnPistols.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/Pistols/N1984.rsi - type: Gun @@ -322,6 +332,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -329,7 +340,7 @@ startingItem: MagazineMagnum insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 + priority: 4 whitelist: tags: - MagazineMagnum @@ -340,6 +351,41 @@ whitelist: tags: - CartridgeMagnum + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - HolographicAimModule + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + handguard_module: !type:ContainerSlot + barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot + - type: PointLight + enabled: false + autoRot: true + - type: Appearance - type: entity name: N1984 @@ -354,7 +400,7 @@ startingItem: MagazineMagnumRubber insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 + priority: 4 whitelist: tags: - MagazineMagnum @@ -365,3 +411,27 @@ whitelist: tags: - CartridgeMagnum + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - HolographicAimModule diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 29cb4859fd..011cb5cba2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -77,6 +77,16 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - state: barrel_module + visible: false + map: [ "enum.ModuleVisualState.BarrelModule" ] + - state: handguard_module + visible: false + map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnAtreides.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Item sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi - type: Clothing @@ -85,10 +95,63 @@ fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + - type: WeaponModules + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 4 + whitelist: + tags: + - MagazinePistolSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - HolographicAimModule + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + handguard_module: !type:ContainerSlot + barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 zeroVisible: true + - type: PointLight + enabled: false + autoRot: true - type: Appearance - type: entity @@ -254,14 +317,24 @@ description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/SMGs/vector.rsi + sprite: White/Objects/Weapons/Guns/SMG/vector.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - state: barrel_module + visible: false + map: [ "enum.ModuleVisualState.BarrelModule" ] + - state: handguard_module + visible: false + map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnVector.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing - sprite: Objects/Weapons/Guns/SMGs/vector.rsi + sprite: White/Objects/Weapons/Guns/SMG/vector.rsi - type: Gun fireRate: 6 selectedMode: FullAuto @@ -269,6 +342,7 @@ path: /Audio/Weapons/Guns/Gunshots/atreides.ogg availableModes: - FullAuto + - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -276,7 +350,7 @@ startingItem: MagazineMagnumSubMachineGun insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 + priority: 4 whitelist: tags: - MagazineMagnumSubMachineGun @@ -287,10 +361,44 @@ whitelist: tags: - CartridgeMagnum + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + handguard_module: !type:ContainerSlot + barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 zeroVisible: true + - type: PointLight + enabled: false + autoRot: true - type: Appearance - type: entity @@ -474,3 +582,27 @@ whitelist: tags: - CartridgeMagnum + barrel_module: + name: Barrel Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseBarrelModule + handguard_module: + name: Handguard Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png new file mode 100644 index 0000000000..f45c81d3ab Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png new file mode 100644 index 0000000000..13ccfdc47a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png new file mode 100644 index 0000000000..984060bd91 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png new file mode 100644 index 0000000000..92f2c6e391 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png new file mode 100644 index 0000000000..ab0d0a822f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..ab0d0a822f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png new file mode 100644 index 0000000000..efe47d90cf Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png new file mode 100644 index 0000000000..3163e2893d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png new file mode 100644 index 0000000000..bbe6128065 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png new file mode 100644 index 0000000000..73e6d63b9c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png new file mode 100644 index 0000000000..443e6d2587 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png new file mode 100644 index 0000000000..d9ff0a8bbb Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png new file mode 100644 index 0000000000..2c31db0809 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png new file mode 100644 index 0000000000..c661c6dfdc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json new file mode 100644 index 0000000000..e41fede449 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json @@ -0,0 +1,60 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by IProduceWidgets (github) to make the style of desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 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/Guns/Pistols/N1984.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/silencer.png new file mode 100644 index 0000000000..ef19ad0418 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/silencer.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png index 473c0093a3..69f823cf07 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png new file mode 100644 index 0000000000..7a58e7f2ab Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png index 758a3d79fd..490a85fbf7 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png new file mode 100644 index 0000000000..874348cf0a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png new file mode 100644 index 0000000000..4d517cd1a5 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png index b65146a1d5..bbdd543ce8 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png index 0cd0d589b4..23f5c0db00 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json index d34cbe58eb..fe545b1afa 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json @@ -21,6 +21,24 @@ }, { "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/atreides-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png index ca93e943d6..3ae3a5a172 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png new file mode 100644 index 0000000000..f8ef5735fa Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png new file mode 100644 index 0000000000..54e5ea46f4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png new file mode 100644 index 0000000000..4545503c57 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png new file mode 100644 index 0000000000..f616d25f87 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..061f8bdae9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..061f8bdae9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png new file mode 100644 index 0000000000..c7d6b65805 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png new file mode 100644 index 0000000000..3bcc8ccb33 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png new file mode 100644 index 0000000000..0ffe9c2c55 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png new file mode 100644 index 0000000000..f728a5df1d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png new file mode 100644 index 0000000000..9dfe592de8 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png new file mode 100644 index 0000000000..afb543219f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png new file mode 100644 index 0000000000..d50b3b769b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png new file mode 100644 index 0000000000..b8e1156470 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png new file mode 100644 index 0000000000..6aafc02670 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json new file mode 100644 index 0000000000..bbe6a5fee7 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json @@ -0,0 +1,60 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides), backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 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/Guns/SMG/vector.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/silencer.png new file mode 100644 index 0000000000..d3af4ef783 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/silencer.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png new file mode 100644 index 0000000000..ca059f7921 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png new file mode 100644 index 0000000000..07ae159cce Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json new file mode 100644 index 0000000000..11b7fc66e7 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Aviu", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "holographic" + }, + { + "name": "telescopic" + }, + { + "name": "aim_module" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png new file mode 100644 index 0000000000..6c5b21537d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png new file mode 100644 index 0000000000..9e85663501 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png new file mode 100644 index 0000000000..afa2829b8a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json new file mode 100644 index 0000000000..6fbb997439 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Aviu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "holographic" + }, + { + "name": "telescopic" + }, + { + "name": "aim_module" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png new file mode 100644 index 0000000000..f7192dc131 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png new file mode 100644 index 0000000000..ca4d3c7f38 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png new file mode 100644 index 0000000000..9583bb157f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json new file mode 100644 index 0000000000..6fbb997439 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Aviu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "holographic" + }, + { + "name": "telescopic" + }, + { + "name": "aim_module" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png new file mode 100644 index 0000000000..b020496b5b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png differ