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

Firearms Upkeep #1421

Merged
merged 6 commits into from
Jan 22, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
tags:
- CartridgeLightRifle
proto: CartridgeLightRifle
capacity: 23
capacity: 23 #imp
- type: Item
size: Small
- type: ContainerContainer
Expand All @@ -36,7 +36,7 @@
# Magazines
- type: entity
id: MagazineLightRifleBox
name: "L6 SAW magazine box (.20 rifle)"
name: "L6 SAW magazine box (.20 rifle)" #imp
parent: BaseMagazineLightRifle
components:
- type: Tag
Expand All @@ -45,8 +45,8 @@
- type: BallisticAmmoProvider
whitelist:
tags:
- CartridgeRifle
proto: CartridgeRifle
- CartridgeRifle #imp
proto: CartridgeRifle #imp
capacity: 100
- type: Item
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 21
Piercing: 21 #imp

- type: entity
id: BulletCaselessRiflePractice
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
- type: entity
id: BulletHeavyRifle
name: bullet (.20 rifle)
name: bullet (.20 rifle) #imp
parent: BaseBullet
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
types:
Piercing: 19
Piercing: 19 #imp

- type: entity
id: BulletMinigun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 25
Piercing: 25 #imp

- type: entity
id: BulletLightRiflePractice
Expand All @@ -29,8 +29,8 @@
- type: Projectile
damage:
types:
Blunt: 6
Heat: 19
Blunt: 6 #imp
Heat: 19 #imp

- type: entity
id: BulletLightRifleUranium
Expand All @@ -41,5 +41,5 @@
- type: Projectile
damage:
types:
Radiation: 12
Piercing: 13
Radiation: 12 #imp
Piercing: 13 #imp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 19
Piercing: 19 #imp

- type: entity
id: BulletRiflePractice
Expand All @@ -29,8 +29,8 @@
- type: Projectile
damage:
types:
Blunt: 3
Heat: 16
Blunt: 3 #imp
Heat: 16 #imp

- type: entity
id: BulletRifleUranium
Expand All @@ -41,6 +41,6 @@
- type: Projectile
damage:
types:
Radiation: 8
Piercing: 9
Radiation: 8 #imp
Piercing: 9 #imp

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: SpeedLoaderLightRifle
name: "speed loader (.30 rifle)"
name: "speed loader (.20 rifle)" #imp
parent: [ BaseItem, BaseRestrictedContraband ]
components:
- type: Tag
Expand All @@ -11,9 +11,9 @@
mayTransfer: true
whitelist:
tags:
- CartridgeLightRifle
- CartridgeRifle #imp
capacity: 5
proto: CartridgeLightRifle
proto: CartridgeRifle #imp
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
layers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@
name: disabler SMG
parent: [ BaseWeaponBattery, BaseRestrictedContraband ]
id: WeaponDisablerSMG
description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
description: An advanced weapon that exhausts organic targets, weakening them until they collapse. #imp
components:
- type: Item
size: Large
Expand Down Expand Up @@ -549,7 +549,7 @@
name: antique laser pistol
parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
id: WeaponAntiqueLaser
description: All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
description: All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
- MagazineLightRifleBox
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
startingItem: CartridgeRifle #imp
priority: 1
whitelist:
tags:
Expand All @@ -69,7 +69,7 @@
name: L6 SAW
id: WeaponLightMachineGunL6
parent: [BaseWeaponLightMachineGun, Tier3Contraband]
description: A rather traditionally-made Squad Automatic Weapon with a pleasantly lacquered wooden pistol grip. Lacks an LMG stock, decreasing controllability. Uses .20 rifle ammo.
description: A rather traditionally-made Squad Automatic Weapon with a pleasantly lacquered wooden pistol grip. Lacks an LMG stock, decreasing controllability. Uses .20 rifle ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/LMGs/l6.rsi
Expand All @@ -88,7 +88,7 @@
name: L6C ROW
id: WeaponLightMachineGunL6C
parent: BaseItem
description: An L6 SAW for use by cyborgs. Creates .20 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges.
description: An L6 SAW for use by cyborgs. Creates .20 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. #imp
components:
- type: Gun
minAngle: 4
Expand Down Expand Up @@ -116,7 +116,7 @@
containers:
ballistic-ammo: !type:Container
- type: ProjectileBatteryAmmoProvider
proto: CartridgeRifle
proto: CartridgeRifle #imp
fireCost: 100
- type: Battery
maxCharge: 10000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
name: china lake
parent: [BaseWeaponLauncher, BaseGunWieldable, Tier3Contraband]
id: WeaponLauncherChinaLake
description: THOOMP.
description: THOOMP. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
price: 500

- type: entity
name: viper
name: Viper
parent: [BaseWeaponPistol, Tier3Contraband]
id: WeaponPistolViper
description: A small, easily-concealable but somewhat underpowered handgun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo.
Expand Down Expand Up @@ -102,10 +102,10 @@
gun_chamber: !type:ContainerSlot

- type: entity
name: echis
name: Echis
parent: [ BaseItem, Tier3Contraband ]
id: WeaponPistolEchis
description: A viper pistol for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
description: A Viper pistol for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
components:
- type: Gun
fireRate: 5
Expand Down Expand Up @@ -137,10 +137,10 @@
- type: AmmoCounter

- type: entity
name: cobra
name: Cobra
parent: [ BaseWeaponPistol, Tier3Contraband ]
id: WeaponPistolCobra
description: A rugged, integrally-suppressed handgun. Perfect for the robust operator who wants to leave no trace. Uses .25 caseless ammo.
description: A rugged, integrally-suppressed handgun. Perfect for the robust operator who wants to leave no trace. Uses .25 caseless ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
Expand Down Expand Up @@ -186,10 +186,10 @@
gun_chamber: !type:ContainerSlot

- type: entity
name: mk 58
name: Mk 58
parent: [BaseWeaponPistol, BaseRestrictedContraband]
id: WeaponPistolMk58
description: A cheap, ubiquitous sidearm produced by a NanoTrasen subsidiary. It does its job without any hassle. Uses .35 auto ammo.
description: A cheap, ubiquitous sidearm produced by a NanoTrasen subsidiary. It does its job without any hassle. Uses .35 auto ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
name: Mateba
parent: [BaseWeaponRevolver, BaseMajorContraband]
id: WeaponRevolverMateba
description: The iconic sidearm of the dreaded deathsquads... allegedly. Uses .45 magnum ammo.
description: The iconic sidearm of the dreaded death squads... allegedly. Uses .45 magnum ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
name: AKMS
parent: [BaseWeaponRifle, BaseRestrictedContraband]
id: WeaponRifleAk
description: An iconic weapon of war. Simple and effective; favored by revolutionaries everywhere. Uses .30 rifle ammo.
description: An iconic weapon of war. Simple and effective; favored by revolutionaries everywhere. Uses .30 rifle ammo. #imp
components:
- type: Sprite
sprite: _Impstation/Objects/Weapons/Guns/Rifles/ak.rsi
Expand All @@ -65,11 +65,11 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Gun
minAngle: 22
maxAngle: 42
angleIncrease: 3
angleDecay: 18
fireRate: 3.75
minAngle: 22 #imp
maxAngle: 42 #imp
angleIncrease: 3 #imp
angleDecay: 18 #imp
fireRate: 3.75 #imp
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
- type: ChamberMagazineAmmoProvider
Expand Down Expand Up @@ -152,7 +152,7 @@
name: Lecter
parent: [BaseWeaponRifle, BaseRestrictedContraband]
id: WeaponRifleLecter
description: A modern short-barreled assault rifle fielded by militaries and law enforcement throughout many worlds, complete with familiar controls and ergonomics. Uses .20 rifle ammo.
description: A modern short-barreled assault rifle fielded by militaries and law enforcement throughout many worlds, complete with familiar controls and ergonomics. Uses .20 rifle ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
Expand All @@ -164,11 +164,11 @@
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
- type: Gun
fireRate: 4.5
fireRate: 4.5 #imp
selectedMode: FullAuto
availableModes:
- FullAuto
- SemiAuto
- SemiAuto #imp
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
- type: ItemSlots
Expand Down Expand Up @@ -204,7 +204,7 @@
name: Foam Force Astro Ace
parent: [BaseWeaponShotgun, BaseGunWieldable]
id: WeaponRifleFoam
description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy. The body crackles when you squeeze too tightly.
description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy. The body crackles when you squeeze too tightly. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
name: C-20r submachine gun
parent: [BaseWeaponSubMachineGun, Tier3Contraband]
id: WeaponSubMachineGunC20r
description: An SMG often used by the infamous Nuclear Operatives... allegedly. Automatically ejects empty magazines. Uses .35 auto ammo.
description: An SMG often used by the infamous Nuclear Operatives... allegedly. Automatically ejects empty magazines. Uses .35 auto ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
Expand Down Expand Up @@ -123,7 +123,7 @@
name: Drozd
parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband]
id: WeaponSubMachineGunDrozd
description: A standard burst-fire two-handed submachine gun. Uses .35 auto ammo.
description: A standard burst-fire two-handed submachine gun. Uses .35 auto ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
Expand Down Expand Up @@ -228,7 +228,7 @@
name: WT550
parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ]
id: WeaponSubMachineGunWt550
description: An excellent top-loaded, compact Personal Defense Weapon, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
description: An excellent top-loaded, compact Personal Defense Weapon, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# Don't parent to BaseWeaponShotgun because it differs significantly
parent: [BaseItem, BaseGunWieldable, Tier3Contraband]
id: WeaponShotgunBulldog
description: A fully-automatic magazine-fed assault shotgun designed for close-quarters combat. This will get the job done. Uses .50 shotgun shells.
description: A fully-automatic magazine-fed assault shotgun designed for close-quarters combat. This will get the job done. Uses .50 shotgun shells. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
Expand Down Expand Up @@ -105,7 +105,7 @@
name: double-barreled shotgun
parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorSecurityCivilianContraband]
id: WeaponShotgunDoubleBarreled
description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells.
description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
Expand All @@ -128,7 +128,7 @@
name: double-barreled shotgun
parent: WeaponShotgunDoubleBarreled
id: WeaponShotgunDoubleBarreledRubber
description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells.
description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. #imp
suffix: Non-Lethal
components:
- type: BallisticAmmoProvider
Expand All @@ -138,7 +138,7 @@
name: Enforcer
parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband]
id: WeaponShotgunEnforcer
description: A premium semi-automatic combat shotgun, featuring a pistol grip and full-length magazine tube for those nasty close-quarters engagements. Uses .50 shotgun shells.
description: A premium semi-automatic combat shotgun, featuring a pistol grip and full-length magazine tube for those nasty close-quarters engagements. Uses .50 shotgun shells. #imp
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
Expand All @@ -160,7 +160,7 @@
name: Kammerer
parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband]
id: WeaponShotgunKammerer
description: Even centuries after his time, the legacy of John Moses Browning lives on. This pump-action shotgun is a favorite of hunters and militia forces throughout many worlds. Uses .50 shotgun shells.
description: Even centuries after his time, the legacy of John Moses Browning lives on. This pump-action shotgun is a favorite of hunters and militia forces throughout many worlds. Uses .50 shotgun shells. #imp
components:
- type: Item
size: Normal
Expand Down
Loading
Loading