Skip to content

Commit

Permalink
Added new guns (#125)
Browse files Browse the repository at this point in the history
Adds:
Disabler Magnum
a 3 shot stun with less charge in the gun. Rewards careful aim for the
cunning captain

Viperfang.
A mean Assault rifle similar to the lecter, Uses .20 Rifle with 6
firerate. Not a bad choice if you want more than a lecter.

Overclocked Railgun,
3 shots. its rounds go SO fast they look like lasers! and burn through
you!. VERY slow self recharges. With 35 Heat damage.

Ceremonial Rifle.
Similar to the Mosin with a smaller clip and a faster firerate. and made
of modern materials. This thing will do the trick nicely for your larp
session.

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Description.
Adds 4 brand spanking new firearms for your pleasure.
The Magnum Disabler: (Federal)
a 3 shot stunning machine with a 6 round battery. this thing will knock
the wind right out of your foes!


The Overclocked Railgun (Federal)
3 shots. make em count. self recharges but not very fast. its rounds go
so fast they actually vaporize in the air and burn the hell out of your
targets. Hits almost as bad as nanotrausens elites standard issue


The Antique bureaucratic rifle (Federal as well)
Much like a mosin this 5 shot wonder will sling .30 rifle death at those
you deem unworthy of your paperwork. Modernized with fancy metal
(plastic) and a fine paintjob (spraypaint) itll fit in perfectly with
your modern (props) arsenal. Just.. dont expect the world. just cause it
fires faster.


The Viperfang: (Fed- nah it was me. this time...)
Do you think .20 rifle is a underused caliber?
do you want somethin that sounds like a heavy assault rifle but is easy
to carry?
Do you want to blast 25 rounds of death at your enemies?
well boy howdy have i made the rifle for you.
firing JUST slightly faster than our competitors (6 is > 5) this rifle
is sure to tear your foes apart. for the practical murderer.


Thanks. and have fun killing everyone with these things.

there i did a maintainers. are you proud?

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] make the PR

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/471c10cb-9d95-4bf6-b363-85eec6ac40eb
![Screenshot 2025-01-04
015512](https://github.com/user-attachments/assets/5fbb6560-8247-4227-8453-d629744521b5)
![Screenshot 2025-01-04
015058](https://github.com/user-attachments/assets/07f561b8-1a9a-4c84-b247-f99c39e31b7d)
![Screenshot 2025-01-04
011902](https://github.com/user-attachments/assets/b26bfd3a-9a17-4a20-bef9-7653da1790f2)

![Screenshot 2025-01-04
015542](https://github.com/user-attachments/assets/87c6c0b5-0e45-4d64-9b8f-6dab19248f4b)

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---

# Changelog
- add: added Viperfang
- add: Added Magnum Disabler
- add: Added the Ceremonial Rifle
- add: Added the railgun- you get the idea.
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added fun :D
- tweak: Tweaked fun
- fix: Fixed fun!
- remove: Removed fun :(
  • Loading branch information
Erisfiregamer1 authored Jan 5, 2025
2 parents e5c035c + 48685eb commit 6167380
Show file tree
Hide file tree
Showing 62 changed files with 434 additions and 3 deletions.
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

0 comments on commit 6167380

Please sign in to comment.