From 0663576c4698fb0d0a139cd25b16d1bd3b84123a Mon Sep 17 00:00:00 2001 From: Nox Date: Wed, 24 Sep 2025 14:48:34 -0700 Subject: [PATCH] Descriptions for .20 Rifle (#36496) * 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 * Fixed formatting WITHOUT using spaces Signed-off-by: Nox38 * Updated weapon names. Signed-off-by: Nox38 * Added Roomba's suggestions Signed-off-by: Nox38 * Reverted AKMS formatting - outside the scope of this PR. Signed-off-by: Nox38 * Updated Estoc's description. Signed-off-by: Nox38 * Added AugustSun's suggestions. Signed-off-by: Nox38 * Slightly rephrased, im happy with it now. Signed-off-by: Nox38 * Fixed projectile names Signed-off-by: Nox38 * thats not even a bullpup dumbass Signed-off-by: Nox38 --------- Signed-off-by: Nox38 Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml | 4 ++++ .../Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml | 4 ++++ .../Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml | 5 +++++ .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 8 ++++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index e631b9849a..794192c7e3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 7e29dbe995..2559349c4a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 5a83b23475..8e05d114d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index fcb12ef711..6e5580e8a2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -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 -- 2.51.2