juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Descriptions for .20 Rifle (#36496)

Browse Source 
* Initial commit - added Lecter and munitions descriptions, need to make one for the M-90GL...

* Fixed a formatting issue in the Lecter description, should be ready for review!

* Tests gaslighting me

* Third times the charm

* 99% of gamblers quit before the big win

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Updated with roomba's changes

* Formatted descriptions, ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed formatting WITHOUT using spaces

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated weapon names.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added Roomba's suggestions

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Reverted AKMS formatting - outside the scope of this PR.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated Estoc's description.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added AugustSun's suggestions.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slightly rephrased, im happy with it now.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed projectile names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* thats not even a bullpup dumbass

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
This commit is contained in:
Nox
2025-09-24 14:48:34 -07:00
committed by GitHub
parent 0678e3b468
commit 0663576c46
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
View File

@@ -49,6 +49,7 @@
parent: BaseMagazineBoxRifle
id: MagazineBoxRifle
name: ammunition box (.20 rifle)
description: A cardboard box of .20 rifle rounds. Intended to hold general-purpose kinetic ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifle
@@ -63,6 +64,7 @@
parent: BaseMagazineBoxRifle
id: MagazineBoxRiflePractice
name: ammunition box (.20 rifle practice)
description: A cardboard box of .20 rifle rounds. Intended to hold non-harmful chalk ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRiflePractice
@@ -78,6 +80,7 @@
id: MagazineBoxRifleIncendiary
parent: BaseMagazineBoxRifle
name: ammunition box (.20 rifle incendiary)
description: A cardboard box of .20 rifle rounds. Intended to hold self-igniting incendiary ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleIncendiary
@@ -93,6 +96,7 @@
id: MagazineBoxRifleUranium
parent: BaseMagazineBoxRifle
name: ammunition box (.20 rifle uranium)
description: A cardboard box of .20 rifle rounds. Intended to hold exotic uranium-core ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleUranium

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
View File

@@ -22,6 +22,7 @@
id: CartridgeRifle
name: cartridge (.20 rifle)
parent: BaseCartridgeRifle
description: A modern intermediate cartridge for combat rifles. Standard kinetic ammunition is common and useful in most situations.
components:
- type: CartridgeAmmo
proto: BulletRifle
@@ -30,6 +31,7 @@
id: CartridgeRiflePractice
name: cartridge (.20 rifle practice)
parent: BaseCartridgeRifle
description: A modern intermediate cartridge for combat rifles. Chalk ammunition is generally non-harmful, used for practice.
components:
- type: CartridgeAmmo
proto: BulletRiflePractice
@@ -45,6 +47,7 @@
id: CartridgeRifleIncendiary
name: cartridge (.20 rifle incendiary)
parent: BaseCartridgeRifle
description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
components:
- type: CartridgeAmmo
proto: BulletRifleIncendiary
@@ -60,6 +63,7 @@
id: CartridgeRifleUranium
name: cartridge (.20 rifle uranium)
parent: BaseCartridgeRifle
description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside.
components:
- type: CartridgeAmmo
proto: BulletRifleUranium

5
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
View File

@@ -35,6 +35,7 @@
id: MagazineRifle
name: "magazine (.20 rifle)"
parent: BaseMagazineRifle
description: 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifle
@@ -56,6 +57,7 @@
name: "magazine (.20 rifle any)"
suffix: empty
parent: MagazineRifle
description: 25-round double stack magazine for combat rifles.
components:
- type: BallisticAmmoProvider
proto: null
@@ -76,6 +78,7 @@
id: MagazineRifleIncendiary
name: "magazine (.20 rifle incendiary)"
parent: MagazineRifle
description: 25-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleIncendiary
@@ -102,6 +105,7 @@
id: MagazineRiflePractice
name: "magazine (.20 rifle practice)"
parent: BaseMagazineRifle
description: 25-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRiflePractice
@@ -128,6 +132,7 @@
id: MagazineRifleUranium
name: "magazine (.20 rifle uranium)"
parent: BaseMagazineRifle
description: 25-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition.
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleUranium

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -103,10 +103,10 @@
- type: Appearance
- type: entity
name: M-90gl
name: M90 GL
parent: [BaseWeaponRifle, BaseSyndicateContraband]
id: WeaponRifleM90GrenadeLauncher
description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo.
description: "An older bullpup carbine model, with an attached underbarrel grenade launcher.\nFeeds from .20 rifle magazines."
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
@@ -150,7 +150,7 @@
name: Lecter
parent: [BaseWeaponRifle, BaseSecurityContraband]
id: WeaponRifleLecter
description: A high end military grade assault rifle. Uses .20 rifle ammo.
description: "Popular gas-operated combat rifle used heavily by Nanotrasen and SolGov. Operating in semi or fully automatic, its accuracy, stopping power, and reliability make it excel in all manner of environments.\nFeeds from .20 rifle magazines."
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
@@ -224,7 +224,7 @@
name: Estoc DMR
parent: [BaseWeaponRifle, BaseSyndicateContraband]
id: WeaponRifleEstoc
description: A designated marksman rifle, favored for medium-to-long range engagements. Uses .20 rifle ammo.
description: "A designated marksman rifle firing in 3-round bursts. The Estoc was designed as the Lecter’s long-range counterpart, equipped with an extended 20-inch barrel and telescopic sight.\nFeeds from .20 rifle magazines."
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/estoc.rsi