diff --git a/Resources/Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg b/Resources/Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg new file mode 100644 index 00000000000..055904f7fb9 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/35SHR.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/35SHR.ogg new file mode 100644 index 00000000000..7de5a6b4531 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/35SHR.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/45SHR.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/45SHR.ogg new file mode 100644 index 00000000000..5f4884275d2 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/45SHR.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/LightSHR.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/LightSHR.ogg new file mode 100644 index 00000000000..7ca3fe92bbc Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/LightSHR.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/amrifle.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/amrifle.ogg new file mode 100644 index 00000000000..ccf952c95d4 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/amrifle.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg new file mode 100644 index 00000000000..662f7d2623f Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg b/Resources/Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg new file mode 100644 index 00000000000..6aac10b8d60 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg b/Resources/Audio/Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg new file mode 100644 index 00000000000..fef260c219f Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg differ diff --git a/Resources/Locale/ru-RU/_NF/research/technologies.ftl b/Resources/Locale/ru-RU/_NF/research/technologies.ftl index 38d7a65dd29..6a888ffeb35 100644 --- a/Resources/Locale/ru-RU/_NF/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_NF/research/technologies.ftl @@ -7,3 +7,4 @@ research-technology-hardsuits-experimental-industrial = Эксперимента research-technology-hardsuits-armored = Бронированные скафандры research-technology-hardsuits-armored-advanced = Продвинутый бронированные скафандры research-technology-hardsuits-experimental-rd = Экспериментальные исследовательские скафандры +research-technology-various-shuttle-weapons = Калиберное вооружение \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/weapons/shuttleammunitions/shuttleriflesammo.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/weapons/shuttleammunitions/shuttleriflesammo.ftl new file mode 100644 index 00000000000..c312f56faa2 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/weapons/shuttleammunitions/shuttleriflesammo.ftl @@ -0,0 +1,4 @@ +ent-ShuttleShotgunShellsBox = Короб .50 патронов для Trophy-50 +ent-ShuttleSmgRifleAmmoBox = Короб .35 патронов для NVT-35 +ent-ShuttleRifleAmmoBox = Короб .30 патронов для АК-6.30 +ent-ShuttleMagnumRifleAmmoBox = Короб .45 патронов для 2А42-45 \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/shuttles/VariousShuttleGuns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/shuttles/VariousShuttleGuns.ftl new file mode 100644 index 00000000000..fe6de4be6ea --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/shuttles/VariousShuttleGuns.ftl @@ -0,0 +1,10 @@ +ent-ShuttleShotgun = Trophy-50 + .desc = Стационарное корабельное орудие, стреляющее ружейными патроными калибра .50. Предназначено для подавления противника. +ent-ShuttleGunAntiMaterial = BOFROG-60/B + .desc = Корабельное орудие внушительных размеров, стреляющее крупнокалиберными патронами 60-го калибра. Способно пробить даже самую крепкую броню. +ent-ShuttleLightRifleGun = АК-6.30 + .desc = Стационарное пулемётное орудие под патроны .30 калибра с ОЧЕНЬ большим запасом боеприпасов. +ent-ShuttleSMGRifle = NVT-35 + .desc = Стационарное малокалиберное орудие с более высокой скорострельностью, в отличие от остальных. +ent-ShuttleMagnumRifle = 2А42-45 + .desc = Ночной кошмар агентов синдиката, что любят прятаться за закрытыми дверьми. Двуствольное орудие под .45-й магнум калибр. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/circuitboards/machine/production.ftl index 97c1337de61..fbd2288a0e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/circuitboards/machine/production.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/circuitboards/machine/production.ftl @@ -1,2 +1,12 @@ ent-PrinterDocMachineCircuitboard = принтер документов (машинная плата) .desc = Машинная плата принтера документов. +ent-ShuttleShotgunMachineCircuitboard = Trophy-50 (машинная плата) + .desc = Машинная плата Trophy-50. +ent-ShuttleGunAntiMaterialMachineCircuitboard = BOFROG-60/B (машинная плата) + .desc = Машинная плата BOFROG-60/B. +ent-ShuttleLightRifleGunMachineCircuitboard = АК-6.30 (машинная плата) + .desc = Машинная плата АК-6.30. +ent-ShuttleSMGRifleMachineCircuitboard = NVT-35 (машинная плата) + .desc = Машинная плата NVT-35. +ent-ShuttleMagnumRifleMachineCircuitboard = 2А42-45 (машинная плата) + .desc = Машинная плата 2А42-45. \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 2e687cf21b5..35dc8adcd23 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -9,6 +9,111 @@ requirements: MatterBin: 3 Manipulator: 1 + +- type: entity + id: ShuttleShotgunMachineCircuitboard + parent: BaseMachineCircuitboard + name: Trophy-50 + description: Machine Board from the shuttle`s gun "Trophy-50" + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: ShuttleShotgun + requirements: + Capacitor: 3 + Manipulator: 2 + MatterBin: 2 +# materialRequirements: +# Cable: 5 +# CableHV: 3 +# Steel: 12 + - type: StaticPrice + price: 150 + +- type: entity + id: ShuttleGunAntiMaterialMachineCircuitboard + parent: BaseMachineCircuitboard + name: BOFROG-60/B + description: Machine Board from the shuttle`s gun "BOFROG-60/B" + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: ShuttleGunAntiMaterial + requirements: + Capacitor: 5 + Manipulator: 3 + MatterBin: 1 +# materialRequirements: +# Cable: 4 +# CableHV: 5 +# Steel: 16 + - type: StaticPrice + price: 150 + +- type: entity + id: ShuttleLightRifleGunMachineCircuitboard + parent: BaseMachineCircuitboard + name: АК-6.30 + description: Machine Board from the shuttle`s gun "АК-6.30" + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: ShuttleLightRifleGun + requirements: + Capacitor: 4 + Manipulator: 4 + MatterBin: 5 +# materialRequirements: +# Cable: 6 +# CableHV: 3 +# Steel: 14 + - type: StaticPrice + price: 150 + +- type: entity + id: ShuttleSMGRifleMachineCircuitboard + parent: BaseMachineCircuitboard + name: NVT-35 + description: Machine Board from the shuttle`s gun "NVT-35" + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: ShuttleSMGRifle + requirements: + Capacitor: 3 + Manipulator: 6 + MatterBin: 3 +# materialRequirements: +# Cable: 4 +# CableHV: 2 +# Steel: 11 + - type: StaticPrice + price: 150 + +- type: entity + id: ShuttleMagnumRifleMachineCircuitboard + parent: BaseMachineCircuitboard + name: 2А42-45 + description: Machine Board from the shuttle`s gun "2А42-45" + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: ShuttleMagnumRifle + requirements: + Capacitor: 6 + Manipulator: 4 + MatterBin: 2 +# materialRequirements: +# Cable: 5 +# CableHV: 3 +# Steel: 18 stackRequirements: Glass: 15 - Steel: 15 \ No newline at end of file + Steel: 15 + - type: StaticPrice + price: 150 diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml index d637cfaead8..aa00d58f938 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml @@ -153,3 +153,80 @@ materials: Steel: 300 Uranium: 300 + +- type: latheRecipe #ShuttleGuns + id: ShuttleShotgunMachineCircuitboard + result: ShuttleShotgunMachineCircuitboard + completetime: 5 + materials: + Steel: 1700 + Glass: 1100 + Gold: 400 + +- type: latheRecipe #ShuttleGuns + id: ShuttleGunAntiMaterialMachineCircuitboard + result: ShuttleGunAntiMaterialMachineCircuitboard + completetime: 13 + materials: + Steel: 3100 + Glass: 2500 + Gold: 1600 + +- type: latheRecipe #ShuttleGuns + id: ShuttleLightRifleGunMachineCircuitboard + result: ShuttleLightRifleGunMachineCircuitboard + completetime: 7 + materials: + Steel: 2400 + Glass: 1800 + Gold: 900 + +- type: latheRecipe #ShuttleGuns + id: ShuttleSMGRifleMachineCircuitboard + result: ShuttleSMGRifleMachineCircuitboard + completetime: 4 + materials: + Steel: 1300 + Glass: 800 + Gold: 400 + +- type: latheRecipe #ShuttleGuns + id: ShuttleMagnumRifleMachineCircuitboard + result: ShuttleMagnumRifleMachineCircuitboard + completetime: 9 + materials: + Steel: 2200 + Glass: 1700 + Gold: 1000 + +- type: latheRecipe #ShuttleGuns + id: ShuttleShotgunShellsBox + result: ShuttleShotgunShellsBox + completetime: 6 + materials: + Steel: 600 + Plastic: 300 + +- type: latheRecipe #ShuttleGuns + id: ShuttleSmgRifleAmmoBox + result: ShuttleSmgRifleAmmoBox + completetime: 10 + materials: + Steel: 1300 + Plastic: 300 + +- type: latheRecipe #ShuttleGuns + id: ShuttleRifleAmmoBox + result: ShuttleRifleAmmoBox + completetime: 15 + materials: + Steel: 2700 + Plastic: 300 + +- type: latheRecipe #ShuttleGuns + id: ShuttleMagnumRifleAmmoBox + result: ShuttleMagnumRifleAmmoBox + completetime: 8 + materials: + Steel: 900 + Plastic: 300 diff --git a/Resources/Prototypes/Corvax/_NF/Entities/Objects/Weapons/ShuttleAmmunitions/ShuttleAmmoBoxes/shuttleriflesammo.yml b/Resources/Prototypes/Corvax/_NF/Entities/Objects/Weapons/ShuttleAmmunitions/ShuttleAmmoBoxes/shuttleriflesammo.yml new file mode 100644 index 00000000000..e95b65ed85f --- /dev/null +++ b/Resources/Prototypes/Corvax/_NF/Entities/Objects/Weapons/ShuttleAmmunitions/ShuttleAmmoBoxes/shuttleriflesammo.yml @@ -0,0 +1,163 @@ +- type: entity + id: ShuttleShotgunShellsBox + name: Cartridge for Trophy-50 + parent: BaseItem + components: + - type: Tag + tags: + - ShuttleShotgunShellsBox + - type: BallisticAmmoProvider + proto: ShellShotgun + mayTransfer: true + whitelist: + tags: + - ShellShotgun + capacity: 24 + soundRack: + path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg + params: + variation: 0.05 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg + params: + variation: 0.05 + - type: Item + size: Large + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi + layers: + - state: 50base + map: ["enum.GunVisualLayers.Base"] + - state: 50mag-6 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: 50mag + steps: 7 + zeroVisible: false + - type: Appearance + +- type: entity + id: ShuttleSmgRifleAmmoBox + name: Cartridge for NVT-35 + parent: BaseItem + components: + - type: Tag + tags: + - ShuttleSmgRifleAmmoBox + - type: BallisticAmmoProvider + proto: CartridgePistol + mayTransfer: true + whitelist: + tags: + - CartridgePistol + capacity: 100 + soundRack: + path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg + params: + variation: 0.05 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg + params: + variation: 0.05 + - type: Item + size: Large + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi + layers: + - state: 35base + map: ["enum.GunVisualLayers.Base"] + - state: 35mag-8 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: 35mag + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: ShuttleRifleAmmoBox + name: Cartridge for АК-6.30 + parent: BaseItem + components: + - type: Tag + tags: + - ShuttleRifleAmmoBox + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle + capacity: 150 + mayTransfer: true + soundRack: + path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg + params: + variation: 0.05 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg + params: + variation: 0.05 + - type: Item + size: Large + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi + layers: + - state: 30base + map: ["enum.GunVisualLayers.Base"] + - state: 30mag-8 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: 30mag + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: ShuttleMagnumRifleAmmoBox + name: Cartridge for 2А42-45 + parent: BaseItem + components: + - type: Tag + tags: + - ShuttleMagnumRifleAmmoBox + - type: BallisticAmmoProvider + proto: CartridgeMagnum + mayTransfer: true + whitelist: + tags: + - CartridgeMagnum + capacity: 40 + soundRack: + path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg + params: + variation: 0.05 + soundInsert: + path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg + params: + variation: 0.05 + - type: Item + size: Large + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi + layers: + - state: 45base + map: ["enum.GunVisualLayers.Base"] + - state: 45mag-8 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: 45mag + steps: 9 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Corvax/_NF/Entities/Structures/Shuttles/VariousShuttleGuns.yml b/Resources/Prototypes/Corvax/_NF/Entities/Structures/Shuttles/VariousShuttleGuns.yml new file mode 100644 index 00000000000..795841ed8c9 --- /dev/null +++ b/Resources/Prototypes/Corvax/_NF/Entities/Structures/Shuttles/VariousShuttleGuns.yml @@ -0,0 +1,288 @@ +- type: entity + id: ShuttleShotgun + parent: [ShuttleGunBase, ConstructibleMachine] + name: Trophy-50 + description: A stationary shuttle gun that fires a .50 caliber. Designed to suppress the enemy. + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi + layers: + - state: shotgun + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + gun_magazine: !type:ContainerSlot + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 230 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Gun + projectileSpeed: 35 + fireRate: 4.5 + angleDecay: 45 + minAngle: 0 + maxAngle: 17 + selectedMode: FullAuto + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg + params: + pitch: 0.5 + soundEmpty: + path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + priority: 2 + whitelist: + tags: + - ShuttleShotgunShellsBox + insertSound: + path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg + params: + pitch: 1 + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: Machine + board: ShuttleShotgunMachineCircuitboard + +- type: entity + id: ShuttleGunAntiMaterial + parent: [ShuttleGunBase, ConstructibleMachine] + name: BOFROG-60/B + description: An impressive - sized shuttle weapon, firing a large caliber .60. Breaks through most types of armored walls. + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi + layers: + - state: amrifle + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + ballistic-ammo: !type:Container + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 430 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Gun + projectileSpeed: 35 + fireRate: 1.3 + minAngle: 0 + maxAngle: 6 + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/amrifle.ogg + params: + pitch: 0.5 + soundEmpty: + path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeAntiMateriel + capacity: 16 + soundInsert: + path: /Audio/Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg + params: + pitch: 0.91 + - type: Machine + board: ShuttleGunAntiMaterialMachineCircuitboard + +- type: entity + id: ShuttleLightRifleGun + parent: [ShuttleGunBase, ConstructibleMachine] + name: АК-6.30 + description: A stationary shuttle rifle on .30 rifle cartridges with a VERY large supply of ammunition. + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi + layers: + - state: arifle + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + ballistic-ammo: !type:Container + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 260 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Gun + projectileSpeed: 35 + fireRate: 8 + angleDecay: 18 + minAngle: 0 + maxAngle: 11 + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/LightSHR.ogg + params: + pitch: 0.5 + soundEmpty: + path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + priority: 2 + whitelist: + tags: + - ShuttleRifleAmmoBox + insertSound: + path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg + params: + pitch: 1 + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: Machine + board: ShuttleLightRifleGunMachineCircuitboard + +- type: entity + id: ShuttleSMGRifle + parent: [ShuttleGunBase, ConstructibleMachine] + name: NVT-35 + description: A stationary small-caliber weapon with an increased rate of fire, unlike other shuttle`s weapons. + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi + layers: + - state: smgrifle + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + ballistic-ammo: !type:Container + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Gun + projectileSpeed: 35 + fireRate: 11 + angleDecay: 13 + minAngle: 0 + maxAngle: 12 + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/35SHR.ogg + params: + pitch: 0.5 + soundEmpty: + path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + priority: 2 + whitelist: + tags: + - ShuttleSmgRifleAmmoBox + insertSound: + path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg + params: + pitch: 1 + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: Machine + board: ShuttleSMGRifleMachineCircuitboard + +- type: entity + id: ShuttleMagnumRifle + parent: [ShuttleGunBase, ConstructibleMachine] + name: 2А42-45 + description: The nightmare of the syndicate that liked to hide behind doors. Double-barreled .45 caliber gun. + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi + layers: + - state: magnumrifle + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + ballistic-ammo: !type:Container + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 280 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Gun + projectileSpeed: 45 + fireRate: 4.5 + angleDecay: 20 + minAngle: 1 + maxAngle: 10 + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/45SHR.ogg + params: + pitch: 0.5 + soundEmpty: + path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + priority: 2 + whitelist: + tags: + - ShuttleMagnumRifleAmmoBox + insertSound: + path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg + params: + pitch: 1 + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: Machine + board: ShuttleMagnumRifleMachineCircuitboard diff --git a/Resources/Prototypes/Corvax/tags.yml b/Resources/Prototypes/Corvax/tags.yml index 8887fdb65bb..2993a5caead 100644 --- a/Resources/Prototypes/Corvax/tags.yml +++ b/Resources/Prototypes/Corvax/tags.yml @@ -36,3 +36,15 @@ - type: Tag id: PokerCardClassic + +- type: Tag + id: ShuttleShotgunShellsBox + +- type: Tag + id: ShuttleRifleAmmoBox + +- type: Tag + id: ShuttleSmgRifleAmmoBox + +- type: Tag + id: ShuttleMagnumRifleAmmoBox diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d08b4e85bb0..f0684e76170 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1020,7 +1020,7 @@ - WeaponLaserCarbinePractice - Zipties dynamicRecipes: - #CorvaxFrontier Start +#CorvaxFrontier Start - MagazineBoxVector22Practice - MagazineBoxVector22Incendiary - MagazineBoxVector22Uranium @@ -1033,11 +1033,19 @@ - MagazineVector45Practice - MagazineVector45Incendiary - MagazineVector45Uranium - #CorvaxFrontier End + - ShuttleShotgunMachineCircuitboard + - ShuttleGunAntiMaterialMachineCircuitboard + - ShuttleLightRifleGunMachineCircuitboard + - ShuttleSMGRifleMachineCircuitboard + - ShuttleMagnumRifleMachineCircuitboard + - ShuttleShotgunShellsBox + - ShuttleSmgRifleAmmoBox + - ShuttleRifleAmmoBox + - ShuttleMagnumRifleAmmoBox +#CorvaxFrontier End - BoxBeanbag - BoxShotgunIncendiary - BoxShotgunUranium - - BoxShellTranquilizer - ExplosivePayload - FlashPayload - GrenadeBlast @@ -1085,8 +1093,8 @@ - Truncheon - VoiceTrigger - WeaponAdvancedLaser - # - WeaponDisabler - # - WeaponDisablerSMG +# - WeaponDisabler +# - WeaponDisablerSMG - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4db9d1a14f6..a4c026e649c 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -242,3 +242,25 @@ - WeaponMagmiteCrusherGlaive technologyPrerequisites: - SalvageWeapons + +- type: technology # Corvax-Frontier + id: VariousShuttleWeapons + name: research-technology-various-shuttle-weapons + icon: + sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi + state: 35base + discipline: Arsenal + tier: 3 + cost: 30000 + recipeUnlocks: + - ShuttleShotgunMachineCircuitboard + - ShuttleGunAntiMaterialMachineCircuitboard + - ShuttleLightRifleGunMachineCircuitboard + - ShuttleSMGRifleMachineCircuitboard + - ShuttleMagnumRifleMachineCircuitboard + - ShuttleShotgunShellsBox + - ShuttleSmgRifleAmmoBox + - ShuttleRifleAmmoBox + - ShuttleMagnumRifleAmmoBox + technologyPrerequisites: + - BasicShuttleArmament diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30base.png new file mode 100644 index 00000000000..ba48d862f18 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30base.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-1.png new file mode 100644 index 00000000000..28aec61450d Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-2.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-2.png new file mode 100644 index 00000000000..60a5c395d93 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-2.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-3.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-3.png new file mode 100644 index 00000000000..c357b755551 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-3.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-4.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-4.png new file mode 100644 index 00000000000..e360940c2e2 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-4.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-5.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-5.png new file mode 100644 index 00000000000..ec88caa5210 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-5.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-6.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-6.png new file mode 100644 index 00000000000..fee9aa193bc Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-6.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-7.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-7.png new file mode 100644 index 00000000000..b5b4605c3bc Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-7.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-8.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-8.png new file mode 100644 index 00000000000..7a6591cf910 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/30mag-8.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35base.png new file mode 100644 index 00000000000..9607d15755f Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35base.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-1.png new file mode 100644 index 00000000000..012990b36ae Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-2.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-2.png new file mode 100644 index 00000000000..adc791694f7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-2.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-3.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-3.png new file mode 100644 index 00000000000..349385b0abf Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-3.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-4.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-4.png new file mode 100644 index 00000000000..87468ac0f76 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-4.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-5.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-5.png new file mode 100644 index 00000000000..4b69b3e02b9 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-5.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-6.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-6.png new file mode 100644 index 00000000000..7a8633aab9a Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-6.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-7.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-7.png new file mode 100644 index 00000000000..9d8699b7683 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-7.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-8.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-8.png new file mode 100644 index 00000000000..1a043dc469c Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/35mag-8.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45base.png new file mode 100644 index 00000000000..10c24d465c3 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45base.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-1.png new file mode 100644 index 00000000000..b7f30a092d1 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-2.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-2.png new file mode 100644 index 00000000000..cf7777b24a0 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-2.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-3.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-3.png new file mode 100644 index 00000000000..fcfe5ca06e3 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-3.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-4.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-4.png new file mode 100644 index 00000000000..b211d276c28 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-4.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-5.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-5.png new file mode 100644 index 00000000000..5fe0da7df51 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-5.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-6.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-6.png new file mode 100644 index 00000000000..f08c948850c Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-6.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-7.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-7.png new file mode 100644 index 00000000000..a0b0b115785 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-7.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-8.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-8.png new file mode 100644 index 00000000000..55e0c9044dc Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/45mag-8.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50base.png new file mode 100644 index 00000000000..d4e7cee3061 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50base.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-1.png new file mode 100644 index 00000000000..dc01186ea8c Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-2.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-2.png new file mode 100644 index 00000000000..66bb4d21f6b Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-2.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-3.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-3.png new file mode 100644 index 00000000000..09cbdd3bf80 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-3.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-4.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-4.png new file mode 100644 index 00000000000..8c7578d866a Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-4.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-5.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-5.png new file mode 100644 index 00000000000..c182b463fbf Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-5.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-6.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-6.png new file mode 100644 index 00000000000..b724abea20d Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/50mag-6.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/meta.json new file mode 100644 index 00000000000..8720934b59e --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi/meta.json @@ -0,0 +1,113 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, modifed by sarp. Discord: totallynotsarp", + "states": [ + { + "name": "50base" + }, + { + "name": "50mag-1" + }, + { + "name": "50mag-2" + }, + { + "name": "50mag-3" + }, + { + "name": "50mag-4" + }, + { + "name": "50mag-5" + }, + { + "name": "50mag-6" + }, + { + "name": "30base" + }, + { + "name": "30mag-1" + }, + { + "name": "30mag-2" + }, + { + "name": "30mag-3" + }, + { + "name": "30mag-4" + }, + { + "name": "30mag-5" + }, + { + "name": "30mag-6" + }, + { + "name": "30mag-7" + }, + { + "name": "30mag-8" + }, + { + "name": "35base" + }, + { + "name": "35mag-1" + }, + { + "name": "35mag-2" + }, + { + "name": "35mag-3" + }, + { + "name": "35mag-4" + }, + { + "name": "35mag-5" + }, + { + "name": "35mag-6" + }, + { + "name": "35mag-7" + }, + { + "name": "35mag-8" + }, + { + "name": "45base" + }, + { + "name": "45mag-1" + }, + { + "name": "45mag-2" + }, + { + "name": "45mag-3" + }, + { + "name": "45mag-4" + }, + { + "name": "45mag-5" + }, + { + "name": "45mag-6" + }, + { + "name": "45mag-7" + }, + { + "name": "45mag-8" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/amrifle.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/amrifle.png new file mode 100644 index 00000000000..b0293ba0761 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/amrifle.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/meta.json new file mode 100644 index 00000000000..e40cbff59de --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by sarp. (Discord: totallynotsarp)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "amrifle" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/arifle.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/arifle.png new file mode 100644 index 00000000000..da7db212181 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/arifle.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/mag-1.png new file mode 100644 index 00000000000..b912c4a7692 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/meta.json new file mode 100644 index 00000000000..3212b475d77 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by sarp. (Discord: totallynotsarp)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "arifle" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/mag-1.png new file mode 100644 index 00000000000..a0e2c6eb18a Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/magnumrifle.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/magnumrifle.png new file mode 100644 index 00000000000..1bff3ca4428 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/magnumrifle.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/meta.json new file mode 100644 index 00000000000..5330481abe2 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Sarp. Discord: totallynotsarp", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "magnumrifle" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/mag-1.png new file mode 100644 index 00000000000..9df7d1766b9 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/meta.json new file mode 100644 index 00000000000..e9b6d3aff7e --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by sarp. (Discord: totallynotsarp)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "shotgun" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/shotgun.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/shotgun.png new file mode 100644 index 00000000000..c1cfa349901 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi/shotgun.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/mag-1.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/mag-1.png new file mode 100644 index 00000000000..4d17811dd7d Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/meta.json new file mode 100644 index 00000000000..43731c9556b --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by sarp. (Discord: totallynotsarp)", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "smgrifle" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/smgrifle.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/smgrifle.png new file mode 100644 index 00000000000..3f4d1eb6cb6 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi/smgrifle.png differ