diff --git a/Resources/Locale/ru-RU/ganimed/entities/guns/lsr.ftl b/Resources/Locale/ru-RU/ganimed/entities/guns/lsr.ftl new file mode 100644 index 000000000000..470b0b6e0995 --- /dev/null +++ b/Resources/Locale/ru-RU/ganimed/entities/guns/lsr.ftl @@ -0,0 +1,2 @@ +ent-WeaponEnergySniperRifle = LSR королевское лезвие + .desc = Высокотехнологичная снайперская винтовка, используемая пилотами кораблей и наемными убийцами. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 8f1d2d2abeef..7c43a1a7437c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -960,3 +960,42 @@ soundForce: true - type: StaminaDamageOnCollide damage: 25 + +- type: entity + name: SniperLaser + id: SniperBolt + parent: BaseBullet + noSpawn: true + components: + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: chronobolt + color: "#ff0000" + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + mask: + - Opaque + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + damage: + types: + Heat: 45 + soundHit: + path: "/Audio/Weapons/tap.ogg" + soundForce: true + - type: StaminaDamageOnCollide + damage: 25 + ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 22f02f3407b9..0529fdb24fc9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -313,6 +313,7 @@ - WeaponAdvancedLaser - WeaponLaserCannon - WeaponXrayCannon + - WeaponEnergySniperRifle - type: entity id: ProtolatheHyperConvection @@ -702,6 +703,7 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + - WeaponEnergySniperRifle - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Ganimed/Entities/Objects/Weapons/Guns/Battery/lsr.yml b/Resources/Prototypes/Ganimed/Entities/Objects/Weapons/Guns/Battery/lsr.yml new file mode 100644 index 000000000000..830dd74baa0d --- /dev/null +++ b/Resources/Prototypes/Ganimed/Entities/Objects/Weapons/Guns/Battery/lsr.yml @@ -0,0 +1,41 @@ +#license: CLA +#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt +- type: entity + name: LSR Queen Blade + parent: BaseWeaponBattery + id: WeaponEnergySniperRifle + description: A high-tech sniper rifle used by ship pilots and assassins. + components: + - type: Sprite + sprite: Ganimed/Objects/Guns/Battery/lsr.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Ganimed/Objects/Guns/Battery/lsr.rsi + quickEquip: false + slots: + - Back + - type: Gun + fireRate: 0.75 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: SniperBolt + fireCost: 200 + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: Appearance + - type: Tag + tags: + - HighRiskItem + - type: StaticPrice + price: 750 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 7d5b020cb4a0..a9ff9b229ee1 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -73,6 +73,16 @@ Plastic: 250 Gold: 100 +- type: latheRecipe + id: WeaponEnergySniperRifle + result: WeaponEnergySniperRifle + completetime: 10 + materials: + Steel: 2000 + Glass: 750 + Plastic: 300 + Gold: 300 + - type: latheRecipe id: ForensicPad result: ForensicPad diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4e7f54e6d3a3..3ec3061fcbad 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -120,6 +120,7 @@ cost: 10000 recipeUnlocks: - WeaponLaserCannon + - WeaponEnergySniperRifle - type: technology id: SecurityIntercommunications diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/base.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/base.png new file mode 100644 index 000000000000..9dbc082cd182 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/base.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/equipped-BACKPACK.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..c601a6887ed0 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/icon.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/icon.png new file mode 100644 index 000000000000..bdf1972c962e Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-left.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-left.png new file mode 100644 index 000000000000..578557c7073f Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-right.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-right.png new file mode 100644 index 000000000000..4480cbc191d4 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-1.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-1.png new file mode 100644 index 000000000000..3032ee8c771a Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-2.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-2.png new file mode 100644 index 000000000000..dc9b82904111 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-3.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-3.png new file mode 100644 index 000000000000..e9c3e7686486 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-4.png b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-4.png new file mode 100644 index 000000000000..e9c3e7686486 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/meta.json b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/meta.json new file mode 100644 index 000000000000..b8abc5c31cb6 --- /dev/null +++ b/Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, resprite by Gorox", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/meta.json b/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/meta.json new file mode 100644 index 000000000000..8df0adefd027 --- /dev/null +++ b/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Tgstation at https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sniperbolt" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/sniperbolt.png b/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/sniperbolt.png new file mode 100644 index 000000000000..c68e193f66b9 Binary files /dev/null and b/Resources/Textures/Ganimed/Objects/Guns/Projectiles/sniper.rsi/sniperbolt.png differ