From 11f2590959347e9242754712ba168b07a8b7d3b5 Mon Sep 17 00:00:00 2001 From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com> Date: Sun, 25 Sep 2022 21:51:52 -0700 Subject: [PATCH] Change Drozd magazine text & gun description texts (#11512) --- .../Catalog/Fills/Boxes/ammunition.yml | 16 ++++++++-------- .../Weapons/Guns/Ammunition/Magazines/magnum.yml | 10 +++++----- .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Entities/Objects/Weapons/Guns/LMGs/lmgs.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 8 ++++---- .../Objects/Weapons/Guns/Revolvers/revolvers.yml | 10 +++++----- .../Objects/Weapons/Guns/Rifles/rifles.yml | 6 +++--- .../Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 10 +++++----- .../Objects/Weapons/Guns/Shotguns/shotguns.yml | 10 +++++----- .../Objects/Weapons/Guns/Snipers/snipers.yml | 8 ++++---- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index 9e9cc16cc0..6cd86b3d6c 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -124,10 +124,10 @@ amount: 6 - type: entity - name: box of .40 Drozd magazines + name: box of .40 Vector magazines parent: BoxCardboard id: BoxMagazineMagnumSubMachineGun - description: A box full of .40 Drozd magazines. + description: A box full of .40 Vector magazines. components: - type: StorageFill contents: @@ -135,10 +135,10 @@ amount: 3 - type: entity - name: box of .40 Drozd (high-velocity) magazines + name: box of .40 Vector (high-velocity) magazines parent: BoxCardboard id: BoxMagazineMagnumSubMachineGunHighVelocity - description: A box full of .40 Drozd (high-velocity) magazines. + description: A box full of .40 Vector (high-velocity) magazines. components: - type: StorageFill contents: @@ -146,10 +146,10 @@ amount: 3 - type: entity - name: box of .40 Drozd (practice) magazines + name: box of .40 Vector (practice) magazines parent: BoxCardboard id: BoxMagazineMagnumSubMachineGunPractice - description: A box full of .40 Drozd (practice) magazines. + description: A box full of .40 Vector (practice) magazines. components: - type: StorageFill contents: @@ -157,10 +157,10 @@ amount: 3 - type: entity - name: box of .40 Drozd (rubber) magazines + name: box of .40 Vector (rubber) magazines parent: BoxCardboard id: BoxMagazineMagnumSubMachineGunRubber - description: A box full of .40 Drozd (rubber) magazines. + description: A box full of .40 Vector (rubber) magazines. components: - type: StorageFill contents: 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 02c4edf366..1718ac278b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -33,7 +33,7 @@ - type: entity id: BaseMagazineMagnumSubMachineGun - name: "Drozd magazine (.40 magnum)" + name: "Vector magazine (.40 magnum)" parent: BaseItem abstract: true components: @@ -122,7 +122,7 @@ - type: entity id: MagazineMagnumSubMachineGun - name: "Drozd magazine (.40 magnum)" + name: "Vector magazine (.40 magnum)" parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider @@ -136,7 +136,7 @@ - type: entity id: MagazineMagnumSubMachineGunHighVelocity - name: "Drozd magazine (.40 magnum High-Velocity)" + name: "Vector magazine (.40 magnum High-Velocity)" parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider @@ -150,7 +150,7 @@ - type: entity id: MagazineMagnumSubMachineGunPractice - name: "Drozd magazine (.40 magnum practice)" + name: "Vector magazine (.40 magnum practice)" parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider @@ -164,7 +164,7 @@ - type: entity id: MagazineMagnumSubMachineGunRubber - name: "Drozd magazine (.40 magnum rubber)" + name: "Vector magazine (.40 magnum rubber)" parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index 264842d2bb..54600ef806 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -25,7 +25,7 @@ name: minigun id: WeaponMinigun parent: BaseWeaponHeavyMachineGun - description: Vzzzzzt! Rahrahrahrah! Vrrrrr! + description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/HMGs/minigun.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index a46c8ec7c3..5013dd5062 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -58,7 +58,7 @@ name: L6 SAW id: WeaponLightMachineGunL6 parent: BaseWeaponLightMachineGun - description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. + description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c80552e96b..7b7cab0bac 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -62,7 +62,7 @@ name: viper parent: BaseWeaponPistol id: WeaponPistolViper - description: A small, easily concealable, but somewhat underpowered gun. + description: A small, easily concealable, but somewhat underpowered gun. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi @@ -94,7 +94,7 @@ name: handmade pistol parent: BaseWeaponPistol id: WeaponPistolHandmade - description: Looks unreliable. + description: Looks unreliable. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi @@ -112,7 +112,7 @@ name: cobra parent: BaseWeaponPistol id: WeaponPistolCobra - description: A rugged, robust operator handgun with inbuilt silencer. + description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/cobra.rsi @@ -154,7 +154,7 @@ name: mk 58 parent: BaseWeaponPistol id: WeaponPistolMk58 - description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. + description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/mk58.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 4d9e640a0f..09a0449933 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -45,7 +45,7 @@ name: Deckard parent: BaseWeaponRevolver id: WeaponRevolverDeckard - description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. + description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi @@ -69,7 +69,7 @@ name: Inspector parent: BaseWeaponRevolver id: WeaponRevolverInspector - description: A detective's best friend. + description: A detective's best friend. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi @@ -84,7 +84,7 @@ name: Mateba parent: BaseWeaponRevolver id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded death squads. + description: The iconic sidearm of the dreaded death squads. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi @@ -98,7 +98,7 @@ name: Predator parent: BaseWeaponRevolver id: WeaponRevolverPython - description: A robust revolver favoured by Syndicate agents. + description: A robust revolver favoured by Syndicate agents. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi @@ -109,7 +109,7 @@ name: pirate revolver parent: BaseWeaponRevolver id: WeaponRevolverPirate - description: An odd, muzzle-loading revolver, favoured by pirate crews. + description: An odd, muzzle-loading revolver, favoured by pirate crews. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e43a11d508..04e00066c1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -53,7 +53,7 @@ name: AKMS parent: BaseWeaponRifle id: WeaponRifleAk - description: An iconic weapon of war. + description: An iconic weapon of war. Uses .30 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/ak.rsi @@ -99,7 +99,7 @@ name: M-90gl parent: BaseWeaponRifle id: WeaponRifleM90GrenadeLauncher - description: An older bullpup carbine model, with an attached underbarrel grenade launcher. + description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/carbine.rsi @@ -142,7 +142,7 @@ name: Lecter parent: BaseWeaponRifle id: WeaponRifleLecter - description: A high end military grade assault rifle. + description: A high end military grade assault rifle. Uses .20 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/lecter.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 1ed0e17654..6c9f5d8e4c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -56,7 +56,7 @@ name: Atreides parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunAtreides - description: Pla-ket-ket-ket-ket! + description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/atreides.rsi @@ -79,7 +79,7 @@ name: C-20r sub machine gun parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunC20r - description: A firearm that is often used by the infamous nuclear operatives. + description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/c20r.rsi @@ -105,7 +105,7 @@ name: Vector parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunVector - description: An excellent fully automatic Heavy SMG. + description: An excellent fully automatic Heavy SMG. Uses .40 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/vector.rsi @@ -155,7 +155,7 @@ name: WT550 parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunWt550 - description: An excellent SMG, produced by NanoTrasen's Small Arms Division. + description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/wt550.rsi @@ -205,7 +205,7 @@ name: Vector parent: WeaponSubMachineGunVector id: WeaponSubMachineGunVectorRubber - description: An excellent fully automatic Heavy SMG. + description: An excellent fully automatic Heavy SMG. Uses .40 magnum ammo. suffix: Non-Lethal components: - type: ItemSlots diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 0fed3a6e61..eebe8fa732 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -50,7 +50,7 @@ # Don't parent to BaseWeaponShotgun because it differs significantly parent: BaseItem id: WeaponShotgunBulldog - description: It's a magazine-fed shotgun designed for close quarters combat. + description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi @@ -105,7 +105,7 @@ name: double-barreled shotgun parent: BaseWeaponShotgun id: WeaponShotgunDoubleBarreled - description: An immortal classic. + description: An immortal classic. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi @@ -121,7 +121,7 @@ name: Enforcer parent: BaseWeaponShotgun id: WeaponShotgunEnforcer - description: A next-generation Frozen Star shotgun. + description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi @@ -133,7 +133,7 @@ name: Kammerer parent: BaseWeaponShotgun id: WeaponShotgunKammerer - description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. + description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi @@ -146,7 +146,7 @@ name: sawn-off shotgun parent: BaseWeaponShotgun id: WeaponShotgunSawn - description: Groovy! + description: Groovy! Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 035ceb07fe..88af331893 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -43,7 +43,7 @@ name: Kardashev-Mosin parent: BaseWeaponSniper id: WeaponSniperMosin - description: A weapon for hunting, or endless trench warfare. + description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi @@ -52,7 +52,7 @@ name: Hristov parent: BaseWeaponSniper id: WeaponSniperHristov - description: A portable anti-armour rifle. Fires armor piercing 14.5mm shells. + description: A portable anti-armour rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-material ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi @@ -69,7 +69,7 @@ name: musket parent: BaseWeaponSniper id: Musket - description: This should've been in a museum long before you were born. + description: This should've been in a museum long before you were born. Uses .60 anti-material ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/musket.rsi @@ -90,7 +90,7 @@ name: flintlock pistol parent: BaseWeaponSniper id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! + description: A pirate's companion. Yarrr! Uses .60 anti-material ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi