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

X-01 multiphase gun & antique laser gun bullet projectiles #1030

Merged
Merged
Show file tree
Hide file tree
Changes from 6 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
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ ent-WeaponBehonkerLaser = eye of a behonker
.desc = The eye of a behonker, it fires a laser when squeezed.
ent-WeaponEnergyShotgun = energy shotgun
.desc = A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
ent-WeaponMultiphaseEnergyGun = X-01 multiphase energy gun
.desc = Nanotrasen's first attempt to remake the Antique Laser Gun. Has more firing modes on offer but lacks the ability to self-recharge.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-WeaponMultiphaseEnergyGun = мультифазная энергетическая пушка X-01
.desc = Первая попытка Nanotrasen переделать антикварный лазерный пистолет. Имеет больше режимов стрельбы, но не имеет возможности самозарядки.

Roudenn marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -577,10 +577,13 @@
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
- type: Gun
projectileSpeed: 40 #Backmen edit
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

где коммент бэкмен эдит?

- type: HitscanBatteryAmmoProvider
proto: RedMediumLaser
path: /Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg #Backmen edit
params:
volume: -2
- type: ProjectileBatteryAmmoProvider #Backmen edit
proto: BulletEnergyGunLaserMk2
fireCost: 100
- type: BatterySelfRecharger
autoRecharge: true
Expand All @@ -596,7 +599,7 @@
- Sidearm
- WeaponAntiqueLaser
- type: StaticPrice
price: 750
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

где коммент бэкмен эдит?

price: 5750 #Backmen edit
- type: StealTarget
stealGroup: WeaponAntiqueLaser
- type: SentienceTarget # I hope this is only the captain's gun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,19 @@
- type: Clothing
sprite: Backmen/Objects/Weapons/Guns/Energy/x01.rsi
- type: Gun
projectileSpeed: 75
projectileSpeed: 40
soundGunshot:
path: /Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg
params:
volume: -2
- type: Item
size: SmallNormal
- type: ProjectileBatteryAmmoProvider
proto: X01Attack
proto: BulletEnergyGunLaserMk2
fireCost: 100
- type: BatteryWeaponFireModes
fireModes:
- proto: X01Attack
- proto: BulletEnergyGunLaserMk2
fireCost: 100
- proto: BulletDisabler
fireCost: 75
Expand All @@ -37,7 +41,7 @@
- type: Appearance
- type: StaticPrice
price: 5750

- type: entity
name: лазерная пуля
id: X01Attack
Expand All @@ -54,6 +58,53 @@
types:
Heat: 22

- type: entity
name: лазерная пуля
id: BulletEnergyGunLaserMk2
parent: EmitterBolt
categories: [ HideSpawnMenu ]
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: red
- type: Projectile
impactEffect: BulletImpactEffectRedDisabler
damage:
types:
Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
soundHit:
collection: MeatLaserImpact

- type: entity
id: BulletImpactEffectRedDisabler
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
state: impact_laser_greyscale
color: red
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu

- type: entity
name: 45MW.TRG
parent: BaseWeaponBatterySmall
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/pull/44216",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/484fcb08e8e2058b81059424fb5aa77034a3fcf1. Multiphase variant spriyed by Agronomist",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,15 +13,17 @@
{
"name": "base"
},
{
"name": "mag-unshaded-0",
{
"name": "mag-unshaded-0",
"delays": [
[
0.5,
0.5
]
[
0.1,
0.1,
0.1,
0.1
]
]
},
},
{
"name": "mag-unshaded-1"
},
Expand All @@ -36,11 +38,47 @@
},
{
"name": "inhand-left-0",
"directions": 4
"directions": 4,
"delays": [
[
0.3,
0.3
],
[
0.3,
0.3
],
[
0.3,
0.3
],
[
0.3,
0.3
]
]
},
{
"name": "inhand-right-0",
"directions": 4
"directions": 4,
"delays": [
[
0.3,
0.3
],
[
0.3,
0.3
],
[
0.3,
0.3
],
[
0.3,
0.3
]
]
},
{
"name": "inhand-left-1",
Expand Down Expand Up @@ -78,6 +116,10 @@
"name": "equipped-BELT",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "redtrac"
}
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
Loading