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

Added new guns #125

Merged
merged 6 commits into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from 5 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
Original file line number Diff line number Diff line change
Expand Up @@ -939,3 +939,4 @@
autoRechargeRate: 24
autoRechargePause: true
autoRechargePauseTime: 10

Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,49 @@
collection: WeakHit
forceSound: true

- type: entity
name : magnum disabler bolt
id: BulletDisablerMagnum
parent: BaseBullet
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
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: StaminaDamageOnCollide
damage: 45
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 8
soundHit:
collection: WeakHit
forceSound: true

- type: entity
name : disabler bolt practice
id: BulletDisablerPractice
Expand Down Expand Up @@ -1046,7 +1089,7 @@
collection: MeatLaserImpact

- type: entity
name: laser bolt
name: laser bolt
id: BulletLaser
parent: BaseBullet
categories: [ HideSpawnMenu ]
Expand Down Expand Up @@ -1095,7 +1138,7 @@
- type: ProjectileSpread
proto: BulletLaser
count: 5 #50 heat damage if you hit all your shots, but wide spread
spread: 30
spread: 30

- type: entity
name: narrow laser barrage
Expand Down Expand Up @@ -1139,4 +1182,4 @@
- type: ProjectileSpread
proto: BulletDisablerSmg
count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
spread: 9
spread: 9
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,4 @@
whitelist:
tags:
- CartridgeRifle

Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,4 @@
wideAnimationRotation: 135
- type: DamageOtherOnHit
staminaCost: 5

Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@

- type: entity
name: Overclocked Railgun
parent: [BaseWeaponBattery, BaseGunWieldable]
id: WeaponRailgun
description: A railgun that fires projectiles at such high speeds that they become lasers!
components:
- type: Sprite
sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
- type: Gun
selectedMode: SemiAuto
fireRate: 3
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: HitscanBatteryAmmoProvider
proto: Pulse
fireCost: 1000
- type: Battery
maxCharge: 3000
startingCharge: 3000
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 50
autoRechargePause: true
autoRechargePauseTime: 10

- type: entity
name: magnum disabler
parent: BaseWeaponBatterySmall
id: WeaponDisablerMagnum
description: For any self-respecting captain when Security won't get off their asses.
components:
- type: Tag
tags:
- Taser
- Sidearm
- type: Sprite
sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-0
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
quickEquip: false
slots:
- suitStorage
- Belt
- type: Gun
fireRate: 1.5
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletDisablerMagnum
fireCost: 100
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: Battery
maxCharge: 600
startingCharge: 600
- type: GuideHelp
guides:
- Security
- type: MeleeWeapon
damage:
types:
Blunt: 5.0
bluntStaminaDamageFactor: 2.5
wideAnimationRotation: 135
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@

- type: entity
name: Viperfang
parent: BaseWeaponRifle
id: WeaponRifleFang
description: An reliable assault rifle. That uses .30 rifle ammo.
components:
- type: Sprite
sprite: /Textures/_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Gun
fireRate: 6
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
fireOnDropChance: 0.5
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineRifle
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifle
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
priority: 1
whitelist:
tags:
- CartridgeRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: Clothing
sprite: /Textures/_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
quickEquip: false
slots:
- Back
- suitStorage
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
name: antique bureaucratic rifle
parent: WeaponSniperMosin
id: constituion
description: A ceremonial rifle given to the best of the best paperpushers. Uses .30 rifle ammo.
components:
- type: Sprite
sprite: /Textures/_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
- type: Gun
fireRate: 1
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
- type: BallisticAmmoProvider
capacity: 5
proto: CartridgeLightRifle
whitelist:
tags:
- CartridgeLightRifle
- type: Clothing
sprite: /Textures/_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
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.
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
@@ -0,0 +1,81 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, slightly edited by FBI to be revolver",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "mag-unshaded-4"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-0",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-left-0"
},
{
"name": "inhand-left-1"
},
{
"name": "inhand-left-2"
},
{
"name": "inhand-left-3"
},
{
"name": "inhand-left-4"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-right-0"
},
{
"name": "inhand-right-1"
},
{
"name": "inhand-right-2"
},
{
"name": "inhand-right-3"
},
{
"name": "inhand-right-4"
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
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
@@ -0,0 +1,53 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by FBI",
"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": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
Loading
Loading