From: Nox Date: Fri, 11 Apr 2025 04:58:33 +0000 (-0700) Subject: Descriptions for .45 magnum (#36383) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=680544a53a8780d23aa357be650b3a3a3f6a5479;p=space-station-14.git Descriptions for .45 magnum (#36383) * Initial commit: added descriptions to revolvers, N1984, speedloaders, cartridges, and ammo boxes. * Updated descriptions in accordance with Slarti and Roomba's suggestions. * Oops, did a misclick! * Updated Mateba description slightly * Slightly updated pirate revolver description * Updated Mateba description * Updated Mateba description again * Fixed a last occurence of restricted in AP bullets --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 6ccf0a1e2a..bee7b33749 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -28,6 +28,7 @@ parent: BaseMagazineBoxMagnum id: MagazineBoxMagnum name: ammunition box (.45 magnum) + description: A cardboard box of .45 magnum rounds. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnum @@ -42,6 +43,7 @@ parent: BaseMagazineBoxMagnum id: MagazineBoxMagnumPractice name: ammunition box (.45 magnum practice) + description: A cardboard box of .45 magnum rounds. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumPractice @@ -57,6 +59,7 @@ id: MagazineBoxMagnumIncendiary parent: BaseMagazineBoxMagnum name: ammunition box (.45 magnum incendiary) + description: A cardboard box of .45 magnum rounds. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumIncendiary @@ -72,6 +75,7 @@ id: MagazineBoxMagnumUranium parent: BaseMagazineBoxMagnum name: ammunition box (.45 magnum uranium) + description: A cardboard box of .45 magnum rounds. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumUranium @@ -87,6 +91,7 @@ id: MagazineBoxMagnumAP parent: BaseMagazineBoxMagnum name: ammunition box (.45 magnum armor-piercing) + description: A cardboard box of .45 magnum rounds. Intended to hold rare armor-piercing ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 383d2adac7..c7adfb5b1e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -22,6 +22,7 @@ id: CartridgeMagnum name: cartridge (.45 magnum) parent: BaseCartridgeMagnum + description: Heavy magnum cartridge mostly used by revolvers. Standard kinetic ammunition is common and useful in most situations. components: - type: CartridgeAmmo proto: BulletMagnum @@ -30,6 +31,7 @@ id: CartridgeMagnumPractice name: cartridge (.45 magnum practice) parent: BaseCartridgeMagnum + description: Heavy magnum cartridge mostly used by revolvers. Chalk ammunition is generally non-harmful, used for practice. components: - type: CartridgeAmmo proto: BulletMagnumPractice @@ -45,6 +47,7 @@ id: CartridgeMagnumIncendiary name: cartridge (.45 magnum incendiary) parent: BaseCartridgeMagnum + description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. components: - type: CartridgeAmmo proto: BulletMagnumIncendiary @@ -60,6 +63,7 @@ id: CartridgeMagnumAP name: cartridge (.45 magnum armor-piercing) parent: BaseCartridgeMagnum + description: Heavy magnum cartridge mostly used by revolvers. Armor piercing ammunition is renowned for its ability to cut straight through body armor. components: - type: CartridgeAmmo proto: BulletMagnumAP @@ -75,6 +79,7 @@ id: CartridgeMagnumUranium name: cartridge (.45 magnum uranium) parent: BaseCartridgeMagnum + description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside. components: - type: CartridgeAmmo proto: BulletMagnumUranium @@ -85,4 +90,3 @@ - state: tip map: [ "enum.AmmoVisualLayers.Tip" ] color: "#65fe08" - diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 91a3e4f360..d94bc444a7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -52,6 +52,7 @@ name: pistol magazine (.45 magnum any) suffix: empty parent: BaseMagazineMagnum + description: 7-round single stack pistol magazine. components: - type: BallisticAmmoProvider proto: null @@ -66,6 +67,7 @@ id: MagazineMagnum name: pistol magazine (.45 magnum) parent: BaseMagazineMagnum + description: 7-round single stack pistol magazine. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnum @@ -80,6 +82,7 @@ id: MagazineMagnumPractice name: pistol magazine (.45 magnum practice) parent: BaseMagazineMagnum + description: 7-round single stack pistol magazine. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumPractice @@ -94,6 +97,7 @@ id: MagazineMagnumUranium name: pistol magazine (.45 magnum uranium) parent: BaseMagazineMagnum + description: 7-round single stack pistol magazine. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumUranium @@ -108,6 +112,7 @@ id: MagazineMagnumAP name: pistol magazine (.45 magnum armor-piercing) parent: BaseMagazineMagnum + description: 7-round single stack pistol magazine. Intended to hold rare armor-piercing ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index 3044b1f9ff..9976c88314 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -23,6 +23,7 @@ id: SpeedLoaderMagnum name: "speed loader (.45 magnum)" parent: BaseSpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnum @@ -43,6 +44,7 @@ id: SpeedLoaderMagnumEmpty name: "speed loader (.45 magnum any)" parent: SpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds for the big iron on your hip. #Big Iron reference (duh) components: - type: BallisticAmmoProvider proto: null @@ -61,6 +63,7 @@ id: SpeedLoaderMagnumIncendiary name: "speed loader (.45 magnum incendiary)" parent: SpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumIncendiary @@ -69,6 +72,7 @@ id: SpeedLoaderMagnumPractice name: "speed loader (.45 magnum practice)" parent: BaseSpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold non-harmful chalk ammunition, perfect for practicing your quick draw. components: - type: BallisticAmmoProvider proto: CartridgeMagnumPractice @@ -89,6 +93,7 @@ id: SpeedLoaderMagnumAP name: "speed loader (.45 magnum armor-piercing)" parent: BaseSpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold rare armor-piercing ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumAP @@ -109,6 +114,7 @@ id: SpeedLoaderMagnumUranium name: "speed loader (.45 magnum uranium)" parent: BaseSpeedLoaderMagnum + description: Designed to quickly refill an empty revolver, it fits up to six rounds. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgeMagnumUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 375045e400..c9e3fdd034 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -210,8 +210,8 @@ - type: entity name: N1984 parent: [BaseWeaponPistol, BaseSecurityContraband] - id: WeaponPistolN1984 # the spaces in description are for formatting. - description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. + id: WeaponPistolN1984 + description: An exceptionally powerful ‘hand cannon’ designed as part of Nanotrasen's BFG initiative. Chambered in .45, the lord’s caliber, it is generally considered too unwieldy for standard use but has become something of a status symbol among Nanotrasen officials. Feeds from .45 pistol magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/N1984.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 564ef7f869..18f0d1c109 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -54,7 +54,7 @@ name: Deckard parent: [BaseWeaponRevolver, BaseSecurityCommandContraband] id: WeaponRevolverDeckard - description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. + description: A beautifully machined, custom-built revolver. Used when there is no time for the Voight-Kampff test. Loads 5 rounds of .45 magnum. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi @@ -82,7 +82,7 @@ name: Inspector parent: [BaseWeaponRevolver, BaseSecurityContraband] id: WeaponRevolverInspector - description: A detective's best friend. Uses .45 magnum ammo. + description: A single-action revolver manufactured by various companies. It is readily available on the civilian market, making it a popular choice among private investigators. You feel lucky just holding it. Loads 6 rounds of .45 magnum. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi @@ -97,7 +97,7 @@ name: Mateba parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. + description: A modern revolver used by Nanotrasen’s elite, near mythical ‘Death Squad’ task force. Its unique trigger action and barrel placement enable a high fire rate with minimal muzzle flip. Many have looked down this barrel, but few have lived to tell of it. Loads 6 rounds of .45 magnum. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi @@ -120,7 +120,7 @@ name: Python parent: [BaseWeaponRevolver, BaseSyndicateContraband] id: WeaponRevolverPython - description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. + description: A powerful double-action revolver manufactured by the Syndicate. Loud and flashy, perfect for any agent looking to make a statement. Loads 6 rounds of .45 magnum. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi @@ -153,7 +153,7 @@ name: pirate revolver parent: [BaseWeaponRevolver, BaseMinorContraband] id: WeaponRevolverPirate - description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. + description: A crude single-action revolver handmade by a space pirate. Old and covered in rust, it somehow still works. Loads 5 rounds of .45 magnum. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi