From: Nox Date: Sat, 26 Apr 2025 21:48:40 +0000 (-0700) Subject: Descriptions for .30 Rifle (#36958) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2378b9ad681091eefa351e7803ddb8cf0c7b3980;p=space-station-14.git Descriptions for .30 Rifle (#36958) Initial commit --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 96e9222306..8c4634561f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -45,6 +45,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifle name: ammunition box (.30 rifle) + description: A cardboard box of .30 rifle rounds. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifle @@ -59,6 +60,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRiflePractice name: ammunition box (.30 rifle practice) + description: A cardboard box of .30 rifle rounds. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRiflePractice @@ -74,6 +76,7 @@ id: MagazineBoxLightRifleIncendiary parent: BaseMagazineBoxLightRifle name: ammunition box (.30 rifle incendiary) + description: A cardboard box of .30 rifle rounds. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary @@ -89,6 +92,7 @@ parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRifleUranium name: ammunition box (.30 rifle uranium) + description: A cardboard box of .30 rifle rounds. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index cedb5e2780..bdd4758fd2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -22,6 +22,7 @@ id: CartridgeLightRifle name: cartridge (.30 rifle) parent: BaseCartridgeLightRifle + description: A classic intermediate cartridge used by many combat rifles and LMGs. Standard kinetic ammunition is common and useful in most situations. components: - type: CartridgeAmmo proto: BulletLightRifle @@ -30,6 +31,7 @@ id: CartridgeLightRiflePractice name: cartridge (.30 rifle practice) parent: BaseCartridgeLightRifle + description: A classic intermediate cartridge used by many combat rifles and LMGs. Chalk ammunition is generally non-harmful, used for practice. components: - type: CartridgeAmmo proto: BulletLightRiflePractice @@ -45,6 +47,7 @@ id: CartridgeLightRifleIncendiary name: cartridge (.30 rifle incendiary) parent: BaseCartridgeLightRifle + description: A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. components: - type: CartridgeAmmo proto: BulletLightRifleIncendiary @@ -60,6 +63,7 @@ id: CartridgeLightRifleUranium name: cartridge (.30 rifle uranium) parent: BaseCartridgeLightRifle + description: A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside. components: - type: CartridgeAmmo proto: BulletLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index ab45d91371..58fb5ae6a0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -38,6 +38,7 @@ id: MagazineLightRifleBox name: "L6 SAW magazine box (.30 rifle)" parent: BaseMagazineLightRifle + description: Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition. components: - type: Tag tags: @@ -58,6 +59,7 @@ id: MagazineLightRifle name: "magazine (.30 rifle)" parent: BaseMagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifle @@ -73,6 +75,7 @@ name: "magazine (.30 rifle any)" suffix: empty parent: MagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. components: - type: BallisticAmmoProvider proto: null @@ -87,6 +90,7 @@ id: MagazineLightRiflePractice name: "magazine (.30 rifle practice)" parent: BaseMagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRiflePractice @@ -101,6 +105,7 @@ id: MagazineLightRifleUranium name: "magazine (.30 rifle uranium)" parent: BaseMagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifleUranium @@ -115,6 +120,7 @@ id: MagazineLightRifleIncendiary name: "magazine (.30 rifle incendiary)" parent: MagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index 191f0ae22c..739f092f69 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -2,6 +2,7 @@ id: SpeedLoaderLightRifle name: "speed loader (.30 rifle)" parent: [ BaseItem, BaseSecurityContraband ] + description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Holds 5 rounds of .30 rifle. components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index a415927cc5..93f8177deb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -69,7 +69,7 @@ name: L6 SAW id: WeaponLightMachineGunL6 parent: [BaseWeaponLightMachineGun, BaseSyndicateContraband] - description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. + description: Developed by Waffle Corp, the L6 Squad Automatic Weapon is a deadly light machine gun often used by the Gorlex Marauders. Although bulky and cumbersome, its heavy barrel and high ammo capacity make it perfect for suppressing combatants with a hail of bullets. Feeds from .30 ammo belts. components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index ffe24fc264..ef47ef8b97 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -55,7 +55,7 @@ name: AKMS parent: [BaseWeaponRifle, BaseSecurityContraband] id: WeaponRifleAk - description: An iconic weapon of war. Uses .30 rifle ammo. + description: A somewhat battered combat rifle of a design originating from old Earth. Favored by criminals, militias, and terrorists due to its famed reliability and easy-to-manufacture design. Feeds from .30 rifle magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/ak.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index ff532c94bf..a36da010a1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -42,7 +42,7 @@ name: Kardashev-Mosin parent: [BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband] id: WeaponSniperMosin - description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. + description: A true relic, the Kardashev-Mosin has served in nearly every armed conflict since its creation 670 years ago. The bolt-action design of the rifle remains virtually identical to its original design, whether used for hunting, sniping, or endless trench warfare. Loads 10 rounds of .30 rifle. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi @@ -142,7 +142,7 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeMagnum # changed from Anti-material rifle rounds because it's a flintlock pistol not a Hristov + - CartridgeMagnum # changed from Anti-material rifle rounds because it's a flintlock pistol not a Hristov capacity: 1 proto: CartridgeMagnum - type: StaticPrice