Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LSR-39 Queen Blade #118

Merged
merged 8 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ganimed/entities/guns/lsr.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-WeaponEnergySniperRifle = LSR королевское лезвие
.desc = Высокотехнологичная снайперская винтовка, используемая пилотами кораблей и наемными убийцами.
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@
- WeaponAdvancedLaser
- WeaponLaserCannon
- WeaponXrayCannon
- WeaponEnergySniperRifle

- type: entity
id: ProtolatheHyperConvection
Expand Down Expand Up @@ -702,6 +703,7 @@
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- WeaponEnergySniperRifle
- type: MaterialStorage
whitelist:
tags:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
cost: 10000
recipeUnlocks:
- WeaponLaserCannon
- WeaponEnergySniperRifle

- type: technology
id: SecurityIntercommunications
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions Resources/Textures/Ganimed/Objects/Guns/Battery/lsr.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading