From: Nox Date: Sun, 20 Apr 2025 11:51:27 +0000 (-0700) Subject: Descriptions for .35 auto (#36085) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f4e7601dc93f0ddecb7a542d7b9edca1506411ba;p=space-station-14.git Descriptions for .35 auto (#36085) * Initial commit. * added SMG descriptions * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Updated descriptions to incorporate Roomba's feedback. * Slightly changed Viper description * Minor formatting change * Updated Atreides description * Fixed a minor convention mistake in magazines * Slightly changed the Viper's description to not reveal its manufacturer. * Updated Drozd description. * Rerun test * Updated descriptions in accordance with Roomba's suggestions! * Updated Viper description! * Shit I forgot to remove the cartridge length, did it now! * More smart changes by Roomba * Tests gaslighting me * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Updated WT550 description --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index e081d574d7..9dad0d5785 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -29,6 +29,7 @@ parent: BaseMagazineBoxPistol id: MagazineBoxPistol name: ammunition box (.35 auto) + description: A cardboard box of .35 auto rounds. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -43,6 +44,7 @@ parent: BaseMagazineBoxPistol id: MagazineBoxPistolPractice name: ammunition box (.35 auto practice) + description: A cardboard box of .35 auto rounds. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -58,6 +60,7 @@ id: MagazineBoxPistolIncendiary parent: BaseMagazineBoxPistol name: ammunition box (.35 auto incendiary) + description: A cardboard box of .35 auto rounds. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary @@ -73,6 +76,7 @@ id: MagazineBoxPistolUranium parent: BaseMagazineBoxPistol name: ammunition box (.35 auto uranium) + description: A cardboard box of .35 auto rounds. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index bdf61c85e9..0734e4af02 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -21,6 +21,7 @@ - type: entity id: CartridgePistol name: cartridge (.35 auto) + description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Standard kinetic ammunition is common and useful in most situations. parent: BaseCartridgePistol components: - type: CartridgeAmmo @@ -29,6 +30,7 @@ - type: entity id: CartridgePistolPractice name: cartridge (.35 auto practice) + description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Chalk ammunition is generally non-harmful, used for practice. parent: BaseCartridgePistol components: - type: CartridgeAmmo @@ -44,6 +46,7 @@ - type: entity id: CartridgePistolIncendiary name: cartridge (.35 auto incendiary) + description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. parent: BaseCartridgePistol components: - type: CartridgeAmmo @@ -59,6 +62,7 @@ - type: entity id: CartridgePistolUranium name: cartridge (.35 auto uranium) + description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium core ammunition features a load of fissile material, irradiating the target from the inside. parent: BaseCartridgePistol components: - type: CartridgeAmmo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index e22c649e3c..5e82be567f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -101,6 +101,7 @@ id: MagazinePistolSubMachineGunTopMounted name: WT550 magazine (.35 auto top-mounted) parent: [ BaseItem, BaseSecurityContraband ] + description: Unconventional 30-round top feeding magazine for the WT550 SMG. Intended to hold general-purpose kinetic ammunition. components: - type: Tag tags: @@ -132,6 +133,7 @@ id: MagazinePistolSubMachineGunTopMountedEmpty name: WT550 magazine (.35 auto top-mounted any) parent: MagazinePistolSubMachineGunTopMounted + description: Unconventional 30-round top feeding magazine for the WT550 SMG. components: - type: BallisticAmmoProvider proto: null @@ -140,6 +142,7 @@ id: MagazinePistol name: pistol magazine (.35 auto) parent: BaseMagazinePistol + description: 10-round single-stack magazine for pistols. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -155,6 +158,7 @@ name: pistol magazine (.35 auto any) suffix: empty parent: MagazinePistol + description: 10-round single-stack magazine for pistols. components: - type: BallisticAmmoProvider proto: null @@ -170,6 +174,7 @@ id: MagazinePistolIncendiary name: pistol magazine (.35 auto incendiary) parent: MagazinePistol + description: 10-round single-stack magazine for pistols. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary @@ -178,6 +183,7 @@ id: MagazinePistolPractice name: pistol magazine (.35 auto practice) parent: BaseMagazinePistol + description: 10-round single-stack magazine for pistols. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -192,6 +198,7 @@ id: MagazinePistolUranium name: pistol magazine (.35 auto uranium) parent: BaseMagazinePistol + description: 10-round single-stack magazine for pistols. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolUranium @@ -249,6 +256,7 @@ id: MagazinePistolSubMachineGun name: SMG magazine (.35 auto) parent: BaseMagazinePistolSubMachineGun + description: 30-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -269,6 +277,7 @@ name: SMG magazine (.35 auto any) suffix: empty parent: BaseMagazinePistolSubMachineGun + description: 30-round double-stack magazine for submachine guns. components: - type: BallisticAmmoProvider proto: null @@ -283,6 +292,7 @@ id: MagazinePistolSubMachineGunPractice name: SMG magazine (.35 auto practice) parent: BaseMagazinePistolSubMachineGun + description: 30-round double-stack magazine for submachine guns. Intended to hold non-harmful chalk ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolPractice @@ -297,6 +307,7 @@ id: MagazinePistolSubMachineGunUranium name: SMG magazine (.35 auto uranium) parent: BaseMagazinePistolSubMachineGun + description: 30-round double-stack magazine for submachine guns. Intended to hold exotic uranium-core ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolUranium @@ -311,6 +322,7 @@ parent: BaseMagazinePistolSubMachineGun id: MagazinePistolSubMachineGunIncendiary name: SMG magazine (.35 auto incendiary) + description: 30-round double-stack magazine for submachine guns. Intended to hold self-igniting incendiary ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c9e3fdd034..6f18cbe963 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -72,7 +72,7 @@ name: viper parent: [BaseWeaponPistol, BaseSyndicateContraband] id: WeaponPistolViper - description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. + description: A common handgun illegally modified by the Syndicate. The Viper sports a selector switch between semi-auto and ‘rock and roll’. The standard sidearm for any soldier who fights under the three serpents. Feeds from .35 pistol magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi @@ -105,7 +105,7 @@ name: echis parent: [ BaseItem, BaseSyndicateContraband ] id: WeaponPistolEchis - description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. + description: A cyborg-mounted weapon system based on the Viper pistol. Creates ammunition on the fly from an internal fabricator, which slowly self-charges. components: - type: Gun fireRate: 5 @@ -189,7 +189,7 @@ name: mk 58 parent: [BaseWeaponPistol, BaseSecurityContraband] id: WeaponPistolMk58 - description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. + description: Designed by Nanotrasen’s Small Arms Division, the Mk58 is a conventional semi-automatic pistol with a simple recoil-operated action and excellent reliability. The standard sidearm of Nanotrasen’s station security and emergency response teams. Feeds from .35 pistol magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/mk58.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 90789e01d7..492581d900 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -62,7 +62,7 @@ name: Atreides parent: [BaseWeaponSubMachineGun, BaseMajorContraband] id: WeaponSubMachineGunAtreides - description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. + description: A rare machine pistol hailing from the Corporate Wars. Its extremely high fire rate and compact profile make it useful in close quarters combat. Despite its age, it is in remarkably good condition. Feeds from .35 SMG magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/atreides.rsi @@ -85,7 +85,7 @@ name: C-20r submachine gun parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband] id: WeaponSubMachineGunC20r - description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. + description: A classic and widespread submachine gun, infamous for its use by the Gorlex Marauders. One of the first homegrown Waffle Corp. designs, it remains in service today. Feeds from .35 SMG magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/c20r.rsi @@ -123,7 +123,7 @@ name: Drozd parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] id: WeaponSubMachineGunDrozd - description: An excellent fully automatic Heavy SMG. + description: A modern SMG manufactured by Nanotrasen’s Small Arms Division. It features an exceptional rate of fire in burst mode, useful for holding defensive angles or engaging hostiles at longer ranges. Feeds from .35 SMG magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/drozd.rsi @@ -181,7 +181,7 @@ name: WT550 parent: [ BaseWeaponSubMachineGun, BaseSecurityContraband ] id: WeaponSubMachineGunWt550 - description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. + description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/wt550.rsi